From: Thomas Zimmermann Subject: [PATCH v2 17/17] drm/hisilicon: Convert hibmc-drm driver to VRAM MM Date: Wed, 24 Apr 2019 13:48:42 +0200 Message-ID: <20190424114842.4723-18-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 4D55F8920A for ; Wed, 24 Apr 2019 11:48:58 +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 ZXBsYWNlIGhpYm1jJ3MKVFRNLWJhc2VkIG1lbW9yeSBtYW5hZ2VyLiBJdCdzIHRoZSBzYW1lIGlt cGxlbWVudGF0aW9uOyBleGNlcHQgZm9yIHRoZQp0eXBlIG5hbWVzLgoKdjI6CgkqIGltcGxlbWVu dCBoaWJtY19tbWFwKCkgd2l0aCBkcm1fdnJhbV9tbV9tbWFwKCkKClNpZ25lZC1vZmYtYnk6IFRo b21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9oaXNpbGljb24vaGlibWMvS2NvbmZpZyAgICAgICB8ICAgMSArCiAuLi4vZ3B1L2RybS9oaXNp bGljb24vaGlibWMvaGlibWNfZHJtX2Rydi5oICAgfCAgIDcgKy0KIGRyaXZlcnMvZ3B1L2RybS9o aXNpbGljb24vaGlibWMvaGlibWNfdHRtLmMgICB8IDEyNSArKy0tLS0tLS0tLS0tLS0tLS0KIDMg ZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTE5IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24vaGlibWMvS2NvbmZpZyBiL2RyaXZlcnMv Z3B1L2RybS9oaXNpbGljb24vaGlibWMvS2NvbmZpZwppbmRleCAxMTcyMDMwM2NhNDAuLjdjNjNj MmY3ZDI0OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9oaWJtYy9LY29u ZmlnCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24vaGlibWMvS2NvbmZpZwpAQCAtNCw2 ICs0LDcgQEAgY29uZmlnIERSTV9ISVNJX0hJQk1DCiAJc2VsZWN0IERSTV9LTVNfSEVMUEVSCiAJ c2VsZWN0IERSTV9UVE0KIAlzZWxlY3QgRFJNX0dFTV9WUkFNX0hFTFBFUgorCXNlbGVjdCBEUk1f VlJBTV9NTV9IRUxQRVIKIAogCWhlbHAKIAkgIENob29zZSB0aGlzIG9wdGlvbiBpZiB5b3UgaGF2 ZSBhIEhpc2lsaWNvbiBIaWJtYyBzb2MgY2hpcHNldC4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9oaXNpbGljb24vaGlibWMvaGlibWNfZHJtX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2hp c2lsaWNvbi9oaWJtYy9oaWJtY19kcm1fZHJ2LmgKaW5kZXggNmIzNDMwZmM1MTQ4Li5iOTkyNGZi MWViOTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24vaGlibWMvaGlibWNf ZHJtX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24vaGlibWMvaGlibWNfZHJt X2Rydi5oCkBAIC0yNCw3ICsyNCw3IEBACiAjaW5jbHVkZSA8ZHJtL2RybV9mYl9oZWxwZXIuaD4K ICNpbmNsdWRlIDxkcm0vZHJtX2dlbS5oPgogI2luY2x1ZGUgPGRybS9kcm1fZ2VtX3ZyYW1faGVs cGVyLmg+Ci0jaW5jbHVkZSA8ZHJtL3R0bS90dG1fYm9fZHJpdmVyLmg+CisjaW5jbHVkZSA8ZHJt L2RybV92cmFtX21tX2hlbHBlci5oPgogCiBzdHJ1Y3QgaGlibWNfZnJhbWVidWZmZXIgewogCXN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgZmI7CkBAIC00OSw5ICs0OSw4IEBAIHN0cnVjdCBoaWJtY19k cm1fcHJpdmF0ZSB7CiAJc3RydWN0IGRybV9kZXZpY2UgICpkZXY7CiAJYm9vbCBtb2RlX2NvbmZp Z19pbml0aWFsaXplZDsKIAotCS8qIHR0bSAqLwotCXN0cnVjdCB0dG1fYm9fZGV2aWNlIGJkZXY7 Ci0JYm9vbCBpbml0aWFsaXplZDsKKwkvKiB2cmFtICovCisJc3RydWN0IGRybV92cmFtX21tIHZt bTsKIAogCS8qIGZiZGV2ICovCiAJc3RydWN0IGhpYm1jX2ZiZGV2ICpmYmRldjsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24vaGlibWMvaGlibWNfdHRtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2hpYm1jL2hpYm1jX3R0bS5jCmluZGV4IGZiZjhlYjA0OGViYy4u ZTkwMWNmMzQzN2VkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2hpYm1j L2hpYm1jX3R0bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24vaGlibWMvaGlibWNf dHRtLmMKQEAgLTE3LDEyOSArMTcsMjQgQEAKICAqLwogCiAjaW5jbHVkZSA8ZHJtL2RybV9hdG9t aWNfaGVscGVyLmg+Ci0jaW5jbHVkZSA8ZHJtL3R0bS90dG1fcGFnZV9hbGxvYy5oPgogCiAjaW5j bHVkZSAiaGlibWNfZHJtX2Rydi5oIgogCi1zdGF0aWMgaW5saW5lIHN0cnVjdCBoaWJtY19kcm1f cHJpdmF0ZSAqCi1oaWJtY19iZGV2KHN0cnVjdCB0dG1fYm9fZGV2aWNlICpiZCkKLXsKLQlyZXR1 cm4gY29udGFpbmVyX29mKGJkLCBzdHJ1Y3QgaGlibWNfZHJtX3ByaXZhdGUsIGJkZXYpOwotfQot Ci1zdGF0aWMgaW50Ci1oaWJtY19ib19pbml0X21lbV90eXBlKHN0cnVjdCB0dG1fYm9fZGV2aWNl ICpiZGV2LCB1MzIgdHlwZSwKLQkJICAgICAgIHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAq bWFuKQotewotCXN3aXRjaCAodHlwZSkgewotCWNhc2UgVFRNX1BMX1NZU1RFTToKLQkJbWFuLT5m bGFncyA9IFRUTV9NRU1UWVBFX0ZMQUdfTUFQUEFCTEU7Ci0JCW1hbi0+YXZhaWxhYmxlX2NhY2hp bmcgPSBUVE1fUExfTUFTS19DQUNISU5HOwotCQltYW4tPmRlZmF1bHRfY2FjaGluZyA9IFRUTV9Q TF9GTEFHX0NBQ0hFRDsKLQkJYnJlYWs7Ci0JY2FzZSBUVE1fUExfVlJBTToKLQkJbWFuLT5mdW5j ID0gJnR0bV9ib19tYW5hZ2VyX2Z1bmM7Ci0JCW1hbi0+ZmxhZ3MgPSBUVE1fTUVNVFlQRV9GTEFH X0ZJWEVEIHwKLQkJCVRUTV9NRU1UWVBFX0ZMQUdfTUFQUEFCTEU7Ci0JCW1hbi0+YXZhaWxhYmxl X2NhY2hpbmcgPSBUVE1fUExfRkxBR19VTkNBQ0hFRCB8Ci0JCQlUVE1fUExfRkxBR19XQzsKLQkJ bWFuLT5kZWZhdWx0X2NhY2hpbmcgPSBUVE1fUExfRkxBR19XQzsKLQkJYnJlYWs7Ci0JZGVmYXVs dDoKLQkJRFJNX0VSUk9SKCJ1bnN1cHBvcnRlZCBtZW1vcnkgdHlwZSAldVxuIiwgdHlwZSk7Ci0J CXJldHVybiAtRUlOVkFMOwotCX0KLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGludCBoaWJtY190 dG1faW9fbWVtX3Jlc2VydmUoc3RydWN0IHR0bV9ib19kZXZpY2UgKmJkZXYsCi0JCQkJICAgIHN0 cnVjdCB0dG1fbWVtX3JlZyAqbWVtKQotewotCXN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAq bWFuID0gJmJkZXYtPm1hblttZW0tPm1lbV90eXBlXTsKLQlzdHJ1Y3QgaGlibWNfZHJtX3ByaXZh dGUgKmhpYm1jID0gaGlibWNfYmRldihiZGV2KTsKLQotCW1lbS0+YnVzLmFkZHIgPSBOVUxMOwot CW1lbS0+YnVzLm9mZnNldCA9IDA7Ci0JbWVtLT5idXMuc2l6ZSA9IG1lbS0+bnVtX3BhZ2VzIDw8 IFBBR0VfU0hJRlQ7Ci0JbWVtLT5idXMuYmFzZSA9IDA7Ci0JbWVtLT5idXMuaXNfaW9tZW0gPSBm YWxzZTsKLQlpZiAoIShtYW4tPmZsYWdzICYgVFRNX01FTVRZUEVfRkxBR19NQVBQQUJMRSkpCi0J CXJldHVybiAtRUlOVkFMOwotCXN3aXRjaCAobWVtLT5tZW1fdHlwZSkgewotCWNhc2UgVFRNX1BM X1NZU1RFTToKLQkJLyogc3lzdGVtIG1lbW9yeSAqLwotCQlyZXR1cm4gMDsKLQljYXNlIFRUTV9Q TF9WUkFNOgotCQltZW0tPmJ1cy5vZmZzZXQgPSBtZW0tPnN0YXJ0IDw8IFBBR0VfU0hJRlQ7Ci0J CW1lbS0+YnVzLmJhc2UgPSBwY2lfcmVzb3VyY2Vfc3RhcnQoaGlibWMtPmRldi0+cGRldiwgMCk7 Ci0JCW1lbS0+YnVzLmlzX2lvbWVtID0gdHJ1ZTsKLQkJYnJlYWs7Ci0JZGVmYXVsdDoKLQkJcmV0 dXJuIC1FSU5WQUw7Ci0JfQotCXJldHVybiAwOwotfQotCi1zdGF0aWMgdm9pZCBoaWJtY190dG1f YmFja2VuZF9kZXN0cm95KHN0cnVjdCB0dG1fdHQgKnR0KQotewotCXR0bV90dF9maW5pKHR0KTsK LQlrZnJlZSh0dCk7Ci19Ci0KLXN0YXRpYyBzdHJ1Y3QgdHRtX2JhY2tlbmRfZnVuYyBoaWJtY190 dF9iYWNrZW5kX2Z1bmMgPSB7Ci0JLmRlc3Ryb3kgPSAmaGlibWNfdHRtX2JhY2tlbmRfZGVzdHJv eSwKLX07Ci0KLXN0YXRpYyBzdHJ1Y3QgdHRtX3R0ICpoaWJtY190dG1fdHRfY3JlYXRlKHN0cnVj dCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCi0JCQkJCSAgdTMyIHBhZ2VfZmxhZ3MpCi17Ci0Jc3Ry dWN0IHR0bV90dCAqdHQ7Ci0JaW50IHJldDsKLQotCXR0ID0ga3phbGxvYyhzaXplb2YoKnR0KSwg R0ZQX0tFUk5FTCk7Ci0JaWYgKCF0dCkgewotCQlEUk1fRVJST1IoImZhaWxlZCB0byBhbGxvY2F0 ZSB0dG1fdHRcbiIpOwotCQlyZXR1cm4gTlVMTDsKLQl9Ci0JdHQtPmZ1bmMgPSAmaGlibWNfdHRf YmFja2VuZF9mdW5jOwotCXJldCA9IHR0bV90dF9pbml0KHR0LCBibywgcGFnZV9mbGFncyk7Ci0J aWYgKHJldCkgewotCQlEUk1fRVJST1IoImZhaWxlZCB0byBpbml0aWFsaXplIHR0bV90dDogJWRc biIsIHJldCk7Ci0JCWtmcmVlKHR0KTsKLQkJcmV0dXJuIE5VTEw7Ci0JfQotCXJldHVybiB0dDsK LX0KLQotc3RydWN0IHR0bV9ib19kcml2ZXIgaGlibWNfYm9fZHJpdmVyID0gewotCS50dG1fdHRf Y3JlYXRlCQk9IGhpYm1jX3R0bV90dF9jcmVhdGUsCi0JLmluaXRfbWVtX3R5cGUJCT0gaGlibWNf Ym9faW5pdF9tZW1fdHlwZSwKLQkuZXZpY3RfZmxhZ3MJCT0gZHJtX2dlbV92cmFtX2JvX2RyaXZl cl9ldmljdF9mbGFncywKLQkubW92ZQkJCT0gTlVMTCwKLQkudmVyaWZ5X2FjY2VzcwkJPSBkcm1f Z2VtX3ZyYW1fYm9fZHJpdmVyX3ZlcmlmeV9hY2Nlc3MsCi0JLmlvX21lbV9yZXNlcnZlCQk9ICZo aWJtY190dG1faW9fbWVtX3Jlc2VydmUsCi0JLmlvX21lbV9mcmVlCQk9IE5VTEwsCitzdGF0aWMg Y29uc3Qgc3RydWN0IGRybV92cmFtX21tX2Z1bmNzIGhpYm1jX3ZyYW1fbW1fZnVuY3MgPSB7CisJ LmV2aWN0X2ZsYWdzID0gZHJtX2dlbV92cmFtX2JvX2RyaXZlcl9ldmljdF9mbGFncywKKwkudmVy aWZ5X2FjY2VzcyA9IGRybV9nZW1fdnJhbV9ib19kcml2ZXJfdmVyaWZ5X2FjY2VzcwogfTsKIAog aW50IGhpYm1jX21tX2luaXQoc3RydWN0IGhpYm1jX2RybV9wcml2YXRlICpoaWJtYykKIHsKIAlp bnQgcmV0OwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBoaWJtYy0+ZGV2OwotCXN0cnVjdCB0 dG1fYm9fZGV2aWNlICpiZGV2ID0gJmhpYm1jLT5iZGV2OwotCi0JcmV0ID0gdHRtX2JvX2Rldmlj ZV9pbml0KCZoaWJtYy0+YmRldiwKLQkJCQkgJmhpYm1jX2JvX2RyaXZlciwKLQkJCQkgZGV2LT5h bm9uX2lub2RlLT5pX21hcHBpbmcsCi0JCQkJIHRydWUpOwotCWlmIChyZXQpIHsKLQkJRFJNX0VS Uk9SKCJlcnJvciBpbml0aWFsaXppbmcgYm8gZHJpdmVyOiAlZFxuIiwgcmV0KTsKLQkJcmV0dXJu IHJldDsKLQl9CiAKLQlyZXQgPSB0dG1fYm9faW5pdF9tbShiZGV2LCBUVE1fUExfVlJBTSwKLQkJ CSAgICAgaGlibWMtPmZiX3NpemUgPj4gUEFHRV9TSElGVCk7CisJcmV0ID0gZHJtX3ZyYW1fbW1f aW5pdCgmaGlibWMtPnZtbSwgZGV2LAorCQkJICAgICAgIHBjaV9yZXNvdXJjZV9zdGFydChkZXYt PnBkZXYsIDApLAorCQkJICAgICAgIGhpYm1jLT5mYl9zaXplLCAmaGlibWNfdnJhbV9tbV9mdW5j cyk7CiAJaWYgKHJldCkgewotCQlEUk1fRVJST1IoImZhaWxlZCB0dG0gVlJBTSBpbml0OiAlZFxu IiwgcmV0KTsKKwkJRFJNX0VSUk9SKCJFcnJvciBpbml0aWFsaXppbmcgVlJBTSBNTTsgJWRcbiIs IHJldCk7CiAJCXJldHVybiByZXQ7CiAJfQogCkBAIC0xNTIsNyArNDcsNyBAQCB2b2lkIGhpYm1j X21tX2Zpbmkoc3RydWN0IGhpYm1jX2RybV9wcml2YXRlICpoaWJtYykKIAlpZiAoIWhpYm1jLT5t bV9pbml0ZWQpCiAJCXJldHVybjsKIAotCXR0bV9ib19kZXZpY2VfcmVsZWFzZSgmaGlibWMtPmJk ZXYpOworCWRybV92cmFtX21tX2NsZWFudXAoJmhpYm1jLT52bW0pOwogCWhpYm1jLT5tbV9pbml0 ZWQgPSBmYWxzZTsKIH0KIApAQCAtMTYxLDcgKzU2LDcgQEAgaW50IGhpYm1jX21tYXAoc3RydWN0 IGZpbGUgKmZpbHAsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKQogCXN0cnVjdCBkcm1fZmls ZSAqZmlsZV9wcml2ID0gZmlscC0+cHJpdmF0ZV9kYXRhOwogCXN0cnVjdCBoaWJtY19kcm1fcHJp dmF0ZSAqaGlibWMgPSBmaWxlX3ByaXYtPm1pbm9yLT5kZXYtPmRldl9wcml2YXRlOwogCi0JcmV0 dXJuIHR0bV9ib19tbWFwKGZpbHAsIHZtYSwgJmhpYm1jLT5iZGV2KTsKKwlyZXR1cm4gZHJtX3Zy YW1fbW1fbW1hcChmaWxwLCB2bWEsICZoaWJtYy0+dm1tKTsKIH0KIAogaW50IGhpYm1jX2dlbV9j cmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdTMyIHNpemUsIGJvb2wgaXNrZXJuZWwsCkBA IC0xNzcsNyArNzIsNyBAQCBpbnQgaGlibWNfZ2VtX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB1MzIgc2l6ZSwgYm9vbCBpc2tlcm5lbCwKIAlpZiAoc2l6ZSA9PSAwKQogCQlyZXR1cm4g LUVJTlZBTDsKIAotCWdibyA9IGRybV9nZW1fdnJhbV9jcmVhdGUoZGV2LCAmaGlibWMtPmJkZXYs IHNpemUsIDAsIGZhbHNlKTsKKwlnYm8gPSBkcm1fZ2VtX3ZyYW1fY3JlYXRlKGRldiwgJmhpYm1j LT52bW0uYmRldiwgc2l6ZSwgMCwgZmFsc2UpOwogCWlmIChJU19FUlIoZ2JvKSkgewogCQlyZXQg PSBQVFJfRVJSKGdibyk7CiAJCWlmIChyZXQgIT0gLUVSRVNUQVJUU1lTKQotLSAKMi4yMS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=