From: Thomas Zimmermann Subject: [PATCH v2 10/17] drm/bochs: Convert bochs driver to VRAM MM Date: Wed, 24 Apr 2019 13:48:35 +0200 Message-ID: <20190424114842.4723-11-tzimmermann@suse.de> References: <20190424114842.4723-1-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB2CC8920F for ; Wed, 24 Apr 2019 11:48:55 +0000 (UTC) In-Reply-To: <20190424114842.4723-1-tzimmermann@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: daniel@ffwll.ch, airlied@linux.ie, kraxel@redhat.com, christian.koenig@amd.com, ray.huang@amd.com, Jerry.Zhang@amd.com, hdegoede@redhat.com, z.liuxinliang@hisilicon.com, zourongrong@gmail.com, kong.kongxinwei@hisilicon.com, puck.chen@hisilicon.com Cc: Thomas Zimmermann , dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org List-Id: dri-devel@lists.freedesktop.org VGhlIGRhdGEgc3RydWN0dXJlIHxzdHJ1Y3QgZHJtX3ZyYW1fbW18IGFuZCBpdHMgaGVscGVycyBy ZXBsYWNlIGJvY2hzJwpUVE0tYmFzZWQgbWVtb3J5IG1hbmFnZXIuIEl0J3MgdGhlIHNhbWUgaW1w bGVtZW50YXRpb247IGV4Y2VwdCBmb3IgdGhlCnR5cGUgbmFtZXMuCgp2MjoKCSogaW1wbGVtZW50 IGJvY2hzX21tYXAoKSB3aXRoIGRybV92cmFtX21tX21tYXAoKQoKU2lnbmVkLW9mZi1ieTogVGhv bWFzIFppbW1lcm1hbm4gPHR6aW1tZXJtYW5uQHN1c2UuZGU+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2JvY2hzL0tjb25maWcgICAgfCAgIDEgKwogZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzLmgg ICAgfCAgMTEgKy0tCiBkcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNfbW0uYyB8IDEyOSArKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlv bnMoKyksIDEyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYm9j aHMvS2NvbmZpZyBiL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9LY29uZmlnCmluZGV4IGMwNGY4MDQx YTJiOS4uN2FkMWNmZTQ3YjM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvS2Nv bmZpZworKysgYi9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvS2NvbmZpZwpAQCAtNCw2ICs0LDcgQEAg Y29uZmlnIERSTV9CT0NIUwogCXNlbGVjdCBEUk1fS01TX0hFTFBFUgogCXNlbGVjdCBEUk1fVFRN CiAJc2VsZWN0IERSTV9HRU1fVlJBTV9IRUxQRVIKKwlzZWxlY3QgRFJNX1ZSQU1fTU1fSEVMUEVS CiAJaGVscAogCSAgQ2hvb3NlIHRoaXMgb3B0aW9uIGZvciBxZW11LgogCSAgSWYgTSBpcyBzZWxl Y3RlZCB0aGUgbW9kdWxlIHdpbGwgYmUgY2FsbGVkIGJvY2hzLWRybS4KZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Nocy5oIGIvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hz LmgKaW5kZXggNGNjZjgyZTFjYTY4Li5mZjc1ZDkyMzhjNDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9ib2Nocy9ib2Nocy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Nocy5o CkBAIC0xMiw4ICsxMiw3IEBACiAjaW5jbHVkZSA8ZHJtL2RybV9nZW0uaD4KICNpbmNsdWRlIDxk cm0vZHJtX2dlbV92cmFtX2hlbHBlci5oPgogCi0jaW5jbHVkZSA8ZHJtL3R0bS90dG1fYm9fZHJp dmVyLmg+Ci0jaW5jbHVkZSA8ZHJtL3R0bS90dG1fcGFnZV9hbGxvYy5oPgorI2luY2x1ZGUgPGRy bS9kcm1fdnJhbV9tbV9oZWxwZXIuaD4KIAogLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwogCkBAIC03NSwx MSArNzQsOSBAQCBzdHJ1Y3QgYm9jaHNfZGV2aWNlIHsKIAlzdHJ1Y3QgZHJtX3NpbXBsZV9kaXNw bGF5X3BpcGUgcGlwZTsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciBjb25uZWN0b3I7CiAKLQkvKiB0 dG0gKi8KLQlzdHJ1Y3QgewotCQlzdHJ1Y3QgdHRtX2JvX2RldmljZSBiZGV2OwotCQlib29sIGlu aXRpYWxpemVkOwotCX0gdHRtOworCS8qIHZyYW0gKi8KKwlzdHJ1Y3QgZHJtX3ZyYW1fbW0gdm1t OworCWJvb2wgdm1tX2luaXRpYWxpemVkOwogfTsKIAogLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX21tLmMgYi9kcml2ZXJzL2dwdS9k cm0vYm9jaHMvYm9jaHNfbW0uYwppbmRleCA1ODM3YWRjNmFlMTcuLjI3ZmU0ZmRjODA4YiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2JvY2hzL2JvY2hzX21tLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2JvY2hzL2JvY2hzX21tLmMKQEAgLTksMTM4ICs5LDMxIEBACiAKIC8qIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0gKi8KIAotc3RhdGljIGlubGluZSBzdHJ1Y3QgYm9jaHNfZGV2aWNlICpib2Noc19iZGV2 KHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZCkKLXsKLQlyZXR1cm4gY29udGFpbmVyX29mKGJkLCBz dHJ1Y3QgYm9jaHNfZGV2aWNlLCB0dG0uYmRldik7Ci19Ci0KLXN0YXRpYyBpbnQgYm9jaHNfYm9f aW5pdF9tZW1fdHlwZShzdHJ1Y3QgdHRtX2JvX2RldmljZSAqYmRldiwgdWludDMyX3QgdHlwZSwK LQkJCQkgIHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuKQotewotCXN3aXRjaCAodHlw ZSkgewotCWNhc2UgVFRNX1BMX1NZU1RFTToKLQkJbWFuLT5mbGFncyA9IFRUTV9NRU1UWVBFX0ZM QUdfTUFQUEFCTEU7Ci0JCW1hbi0+YXZhaWxhYmxlX2NhY2hpbmcgPSBUVE1fUExfTUFTS19DQUNI SU5HOwotCQltYW4tPmRlZmF1bHRfY2FjaGluZyA9IFRUTV9QTF9GTEFHX0NBQ0hFRDsKLQkJYnJl YWs7Ci0JY2FzZSBUVE1fUExfVlJBTToKLQkJbWFuLT5mdW5jID0gJnR0bV9ib19tYW5hZ2VyX2Z1 bmM7Ci0JCW1hbi0+ZmxhZ3MgPSBUVE1fTUVNVFlQRV9GTEFHX0ZJWEVEIHwKLQkJCVRUTV9NRU1U WVBFX0ZMQUdfTUFQUEFCTEU7Ci0JCW1hbi0+YXZhaWxhYmxlX2NhY2hpbmcgPSBUVE1fUExfRkxB R19VTkNBQ0hFRCB8Ci0JCQlUVE1fUExfRkxBR19XQzsKLQkJbWFuLT5kZWZhdWx0X2NhY2hpbmcg PSBUVE1fUExfRkxBR19XQzsKLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJRFJNX0VSUk9SKCJVbnN1 cHBvcnRlZCBtZW1vcnkgdHlwZSAldVxuIiwgKHVuc2lnbmVkKXR5cGUpOwotCQlyZXR1cm4gLUVJ TlZBTDsKLQl9Ci0JcmV0dXJuIDA7Ci19Ci0KLXN0YXRpYyBpbnQgYm9jaHNfdHRtX2lvX21lbV9y ZXNlcnZlKHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZGV2LAotCQkJCSAgICBzdHJ1Y3QgdHRtX21l bV9yZWcgKm1lbSkKLXsKLQlzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbiA9ICZiZGV2 LT5tYW5bbWVtLT5tZW1fdHlwZV07Ci0Jc3RydWN0IGJvY2hzX2RldmljZSAqYm9jaHMgPSBib2No c19iZGV2KGJkZXYpOwotCi0JbWVtLT5idXMuYWRkciA9IE5VTEw7Ci0JbWVtLT5idXMub2Zmc2V0 ID0gMDsKLQltZW0tPmJ1cy5zaXplID0gbWVtLT5udW1fcGFnZXMgPDwgUEFHRV9TSElGVDsKLQlt ZW0tPmJ1cy5iYXNlID0gMDsKLQltZW0tPmJ1cy5pc19pb21lbSA9IGZhbHNlOwotCWlmICghKG1h bi0+ZmxhZ3MgJiBUVE1fTUVNVFlQRV9GTEFHX01BUFBBQkxFKSkKLQkJcmV0dXJuIC1FSU5WQUw7 Ci0Jc3dpdGNoIChtZW0tPm1lbV90eXBlKSB7Ci0JY2FzZSBUVE1fUExfU1lTVEVNOgotCQkvKiBz eXN0ZW0gbWVtb3J5ICovCi0JCXJldHVybiAwOwotCWNhc2UgVFRNX1BMX1ZSQU06Ci0JCW1lbS0+ YnVzLm9mZnNldCA9IG1lbS0+c3RhcnQgPDwgUEFHRV9TSElGVDsKLQkJbWVtLT5idXMuYmFzZSA9 IGJvY2hzLT5mYl9iYXNlOwotCQltZW0tPmJ1cy5pc19pb21lbSA9IHRydWU7Ci0JCWJyZWFrOwot CWRlZmF1bHQ6Ci0JCXJldHVybiAtRUlOVkFMOwotCQlicmVhazsKLQl9Ci0JcmV0dXJuIDA7Ci19 Ci0KLXN0YXRpYyB2b2lkIGJvY2hzX3R0bV9pb19tZW1fZnJlZShzdHJ1Y3QgdHRtX2JvX2Rldmlj ZSAqYmRldiwKLQkJCQkgIHN0cnVjdCB0dG1fbWVtX3JlZyAqbWVtKQotewotfQotCi1zdGF0aWMg dm9pZCBib2Noc190dG1fYmFja2VuZF9kZXN0cm95KHN0cnVjdCB0dG1fdHQgKnR0KQotewotCXR0 bV90dF9maW5pKHR0KTsKLQlrZnJlZSh0dCk7Ci19Ci0KLXN0YXRpYyBzdHJ1Y3QgdHRtX2JhY2tl bmRfZnVuYyBib2Noc190dF9iYWNrZW5kX2Z1bmMgPSB7Ci0JLmRlc3Ryb3kgPSAmYm9jaHNfdHRt X2JhY2tlbmRfZGVzdHJveSwKLX07Ci0KLXN0YXRpYyBzdHJ1Y3QgdHRtX3R0ICpib2Noc190dG1f dHRfY3JlYXRlKHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCi0JCQkJCSAgdWludDMyX3Qg cGFnZV9mbGFncykKLXsKLQlzdHJ1Y3QgdHRtX3R0ICp0dDsKLQotCXR0ID0ga3phbGxvYyhzaXpl b2Yoc3RydWN0IHR0bV90dCksIEdGUF9LRVJORUwpOwotCWlmICh0dCA9PSBOVUxMKQotCQlyZXR1 cm4gTlVMTDsKLQl0dC0+ZnVuYyA9ICZib2Noc190dF9iYWNrZW5kX2Z1bmM7Ci0JaWYgKHR0bV90 dF9pbml0KHR0LCBibywgcGFnZV9mbGFncykpIHsKLQkJa2ZyZWUodHQpOwotCQlyZXR1cm4gTlVM TDsKLQl9Ci0JcmV0dXJuIHR0OwotfQotCi1zdGF0aWMgc3RydWN0IHR0bV9ib19kcml2ZXIgYm9j aHNfYm9fZHJpdmVyID0gewotCS50dG1fdHRfY3JlYXRlID0gYm9jaHNfdHRtX3R0X2NyZWF0ZSwK LQkuaW5pdF9tZW1fdHlwZSA9IGJvY2hzX2JvX2luaXRfbWVtX3R5cGUsCi0JLmV2aWN0aW9uX3Zh bHVhYmxlID0gdHRtX2JvX2V2aWN0aW9uX3ZhbHVhYmxlLAorc3RhdGljIGNvbnN0IHN0cnVjdCBk cm1fdnJhbV9tbV9mdW5jcyBib2Noc192cmFtX21tX2Z1bmNzID0gewogCS5ldmljdF9mbGFncyA9 IGRybV9nZW1fdnJhbV9ib19kcml2ZXJfZXZpY3RfZmxhZ3MsCi0JLm1vdmUgPSBOVUxMLAotCS52 ZXJpZnlfYWNjZXNzID0gZHJtX2dlbV92cmFtX2JvX2RyaXZlcl92ZXJpZnlfYWNjZXNzLAotCS5p b19tZW1fcmVzZXJ2ZSA9ICZib2Noc190dG1faW9fbWVtX3Jlc2VydmUsCi0JLmlvX21lbV9mcmVl ID0gJmJvY2hzX3R0bV9pb19tZW1fZnJlZSwKKwkudmVyaWZ5X2FjY2VzcyA9IGRybV9nZW1fdnJh bV9ib19kcml2ZXJfdmVyaWZ5X2FjY2VzcwogfTsKIAogaW50IGJvY2hzX21tX2luaXQoc3RydWN0 IGJvY2hzX2RldmljZSAqYm9jaHMpCiB7Ci0Jc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYgPSAm Ym9jaHMtPnR0bS5iZGV2OwotCWludCByZXQ7Ci0KLQlyZXQgPSB0dG1fYm9fZGV2aWNlX2luaXQo JmJvY2hzLT50dG0uYmRldiwKLQkJCQkgJmJvY2hzX2JvX2RyaXZlciwKLQkJCQkgYm9jaHMtPmRl di0+YW5vbl9pbm9kZS0+aV9tYXBwaW5nLAotCQkJCSB0cnVlKTsKLQlpZiAocmV0KSB7Ci0JCURS TV9FUlJPUigiRXJyb3IgaW5pdGlhbGlzaW5nIGJvIGRyaXZlcjsgJWRcbiIsIHJldCk7Ci0JCXJl dHVybiByZXQ7Ci0JfQotCi0JcmV0ID0gdHRtX2JvX2luaXRfbW0oYmRldiwgVFRNX1BMX1ZSQU0s Ci0JCQkgICAgIGJvY2hzLT5mYl9zaXplID4+IFBBR0VfU0hJRlQpOworCWludCByZXQgPSBkcm1f dnJhbV9tbV9pbml0KCZib2Nocy0+dm1tLCBib2Nocy0+ZGV2LCBib2Nocy0+ZmJfYmFzZSwKKwkJ CQkgICBib2Nocy0+ZmJfc2l6ZSwgJmJvY2hzX3ZyYW1fbW1fZnVuY3MpOwogCWlmIChyZXQpIHsK LQkJRFJNX0VSUk9SKCJGYWlsZWQgdHRtIFZSQU0gaW5pdDogJWRcbiIsIHJldCk7CisJCURSTV9F UlJPUigiRXJyb3IgaW5pdGlhbGl6aW5nIFZSQU0gTU07ICVkXG4iLCByZXQpOwogCQlyZXR1cm4g cmV0OwogCX0KIAotCWJvY2hzLT50dG0uaW5pdGlhbGl6ZWQgPSB0cnVlOworCWJvY2hzLT52bW1f aW5pdGlhbGl6ZWQgPSB0cnVlOwogCXJldHVybiAwOwogfQogCiB2b2lkIGJvY2hzX21tX2Zpbmko c3RydWN0IGJvY2hzX2RldmljZSAqYm9jaHMpCiB7Ci0JaWYgKCFib2Nocy0+dHRtLmluaXRpYWxp emVkKQorCWlmICghYm9jaHMtPnZtbV9pbml0aWFsaXplZCkKIAkJcmV0dXJuOwogCi0JdHRtX2Jv X2RldmljZV9yZWxlYXNlKCZib2Nocy0+dHRtLmJkZXYpOwotCWJvY2hzLT50dG0uaW5pdGlhbGl6 ZWQgPSBmYWxzZTsKKwlkcm1fdnJhbV9tbV9jbGVhbnVwKCZib2Nocy0+dm1tKTsKKwlib2Nocy0+ dm1tX2luaXRpYWxpemVkID0gZmFsc2U7CiB9CiAKIGludCBib2Noc19tbWFwKHN0cnVjdCBmaWxl ICpmaWxwLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSkKQEAgLTE0OCw3ICs0MSw3IEBAIGlu dCBib2Noc19tbWFwKHN0cnVjdCBmaWxlICpmaWxwLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZt YSkKIAlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiA9IGZpbHAtPnByaXZhdGVfZGF0YTsKIAlz dHJ1Y3QgYm9jaHNfZGV2aWNlICpib2NocyA9IGZpbGVfcHJpdi0+bWlub3ItPmRldi0+ZGV2X3By aXZhdGU7CiAKLQlyZXR1cm4gdHRtX2JvX21tYXAoZmlscCwgdm1hLCAmYm9jaHMtPnR0bS5iZGV2 KTsKKwlyZXR1cm4gZHJtX3ZyYW1fbW1fbW1hcChmaWxwLCB2bWEsICZib2Nocy0+dm1tKTsKIH0K IAogLyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLSAqLwpAQCAtMTU4LDcgKzUxLDcgQEAgaW50IGJvY2hzX2R1bWJf Y3JlYXRlKHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwgc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHsK IAlzdHJ1Y3QgYm9jaHNfZGV2aWNlICpib2NocyA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLQlyZXR1 cm4gZHJtX2dlbV92cmFtX2ZpbGxfY3JlYXRlX2R1bWIoZmlsZSwgZGV2LCAmYm9jaHMtPnR0bS5i ZGV2LCAwLAorCXJldHVybiBkcm1fZ2VtX3ZyYW1fZmlsbF9jcmVhdGVfZHVtYihmaWxlLCBkZXYs ICZib2Nocy0+dm1tLmJkZXYsIDAsCiAJCQkJCSAgICAgZmFsc2UsIGFyZ3MpOwogfQogCi0tIAoy LjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==