From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oscar Mateo Subject: [PATCH] drm/i915/guc: Keep the ctx_pool_vaddr mapped, for easy access Date: Thu, 9 Feb 2017 02:23:39 -0800 Message-ID: <1486635819-14980-1-git-send-email-oscar.mateo@intel.com> References: <20170207204956.GJ11545@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 041736EB88 for ; Thu, 9 Feb 2017 18:23:49 +0000 (UTC) In-Reply-To: <20170207204956.GJ11545@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CgpUaGUg R3VDIGRlc2NyaXB0b3IgaXMgYmlnIGluIHNpemUuIElmIHdlIHVzZSBhIGxvY2FsIGRlZmluaXRp b24gb2YKZ3VjX2Rlc2Mgd2UgaGF2ZSBhIGNoYW5jZSB0byBvdmVyZmxvdyBzdGFjaywgc28gYXZv aWQgaXQuCgpBbHNvLCBDaHJpcyBhYmhvcnMgc2NhdHRlcmxpc3RzIDopCgpTaWduZWQtb2ZmLWJ5 OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDgzICsrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCAgICAgICAgICAgIHwgIDEg KwogMiBmaWxlcyBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggOGNlZDllMi4u MDA2NWIzOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpA QCAtOTksMTEgKzk5LDkgQEAgc3RhdGljIGludCBndWNfdXBkYXRlX2Rvb3JiZWxsX2lkKHN0cnVj dCBpbnRlbF9ndWMgKmd1YywKIAkJCQkgIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCwK IAkJCQkgIHUxNiBuZXdfaWQpCiB7Ci0Jc3RydWN0IHNnX3RhYmxlICpzZyA9IGd1Yy0+Y3R4X3Bv b2xfdm1hLT5wYWdlczsKIAl2b2lkICpkb29yYmVsbF9iaXRtYXAgPSBndWMtPmRvb3JiZWxsX2Jp dG1hcDsKIAlzdHJ1Y3QgZ3VjX2Rvb3JiZWxsX2luZm8gKmRvb3JiZWxsOwotCXN0cnVjdCBndWNf Y29udGV4dF9kZXNjIGRlc2M7Ci0Jc2l6ZV90IGxlbjsKKwlzdHJ1Y3QgZ3VjX2NvbnRleHRfZGVz YyAqZGVzYzsKIAogCWRvb3JiZWxsID0gY2xpZW50LT52YWRkciArIGNsaWVudC0+ZG9vcmJlbGxf b2Zmc2V0OwogCkBAIC0xMTYsMTUgKzExNCw4IEBAIHN0YXRpYyBpbnQgZ3VjX3VwZGF0ZV9kb29y YmVsbF9pZChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJfQogCiAJLyogVXBkYXRlIHRoZSBHdUMn cyBpZGVhIG9mIHRoZSBkb29yYmVsbCBJRCAqLwotCWxlbiA9IHNnX3Bjb3B5X3RvX2J1ZmZlcihz Zy0+c2dsLCBzZy0+bmVudHMsICZkZXNjLCBzaXplb2YoZGVzYyksCi0JCQkgICAgIHNpemVvZihk ZXNjKSAqIGNsaWVudC0+Y3R4X2luZGV4KTsKLQlpZiAobGVuICE9IHNpemVvZihkZXNjKSkKLQkJ cmV0dXJuIC1FRkFVTFQ7Ci0JZGVzYy5kYl9pZCA9IG5ld19pZDsKLQlsZW4gPSBzZ19wY29weV9m cm9tX2J1ZmZlcihzZy0+c2dsLCBzZy0+bmVudHMsICZkZXNjLCBzaXplb2YoZGVzYyksCi0JCQkg ICAgIHNpemVvZihkZXNjKSAqIGNsaWVudC0+Y3R4X2luZGV4KTsKLQlpZiAobGVuICE9IHNpemVv ZihkZXNjKSkKLQkJcmV0dXJuIC1FRkFVTFQ7CisJZGVzYyA9IGd1Yy0+Y3R4X3Bvb2xfdmFkZHIg KyBzaXplb2YoKmRlc2MpICogY2xpZW50LT5jdHhfaW5kZXg7CisJZGVzYy0+ZGJfaWQgPSBuZXdf aWQ7CiAKIAljbGllbnQtPmRvb3JiZWxsX2lkID0gbmV3X2lkOwogCWlmIChuZXdfaWQgPT0gR1VD X0lOVkFMSURfRE9PUkJFTExfSUQpCkBAIC0yMzAsMjkgKzIyMSwyNyBAQCBzdGF0aWMgdm9pZCBn dWNfcHJvY19kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogICogZGF0YSBzdHJ1Y3R1 cmVzIHJlbGF0aW5nIHRvIHRoaXMgY2xpZW50IChkb29yYmVsbCwgcHJvY2VzcyBkZXNjcmlwdG9y LAogICogd3JpdGUgcXVldWUsIGV0YykuCiAgKi8KLQogc3RhdGljIHZvaWQgZ3VjX2N0eF9kZXNj X2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQkJICAgICAgc3RydWN0IGk5MTVfZ3VjX2Ns aWVudCAqY2xpZW50KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1 Y190b19pOTE1KGd1Yyk7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCXN0cnVj dCBpOTE1X2dlbV9jb250ZXh0ICpjdHggPSBjbGllbnQtPm93bmVyOwotCXN0cnVjdCBndWNfY29u dGV4dF9kZXNjIGRlc2M7Ci0Jc3RydWN0IHNnX3RhYmxlICpzZzsKKwlzdHJ1Y3QgZ3VjX2NvbnRl eHRfZGVzYyAqZGVzYzsKIAl1bnNpZ25lZCBpbnQgdG1wOwogCXUzMiBnZnhfYWRkcjsKIAotCW1l bXNldCgmZGVzYywgMCwgc2l6ZW9mKGRlc2MpKTsKKwlkZXNjID0gZ3VjLT5jdHhfcG9vbF92YWRk ciArIHNpemVvZigqZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleDsKIAotCWRlc2MuYXR0cmlidXRl ID0gR1VDX0NUWF9ERVNDX0FUVFJfQUNUSVZFIHwgR1VDX0NUWF9ERVNDX0FUVFJfS0VSTkVMOwot CWRlc2MuY29udGV4dF9pZCA9IGNsaWVudC0+Y3R4X2luZGV4OwotCWRlc2MucHJpb3JpdHkgPSBj bGllbnQtPnByaW9yaXR5OwotCWRlc2MuZGJfaWQgPSBjbGllbnQtPmRvb3JiZWxsX2lkOworCWRl c2MtPmF0dHJpYnV0ZSA9IEdVQ19DVFhfREVTQ19BVFRSX0FDVElWRSB8IEdVQ19DVFhfREVTQ19B VFRSX0tFUk5FTDsKKwlkZXNjLT5jb250ZXh0X2lkID0gY2xpZW50LT5jdHhfaW5kZXg7CisJZGVz Yy0+cHJpb3JpdHkgPSBjbGllbnQtPnByaW9yaXR5OworCWRlc2MtPmRiX2lkID0gY2xpZW50LT5k b29yYmVsbF9pZDsKIAogCWZvcl9lYWNoX2VuZ2luZV9tYXNrZWQoZW5naW5lLCBkZXZfcHJpdiwg Y2xpZW50LT5lbmdpbmVzLCB0bXApIHsKIAkJc3RydWN0IGludGVsX2NvbnRleHQgKmNlID0gJmN0 eC0+ZW5naW5lW2VuZ2luZS0+aWRdOwogCQl1aW50MzJfdCBndWNfZW5naW5lX2lkID0gZW5naW5l LT5ndWNfaWQ7Ci0JCXN0cnVjdCBndWNfZXhlY2xpc3RfY29udGV4dCAqbHJjID0gJmRlc2MubHJj W2d1Y19lbmdpbmVfaWRdOworCQlzdHJ1Y3QgZ3VjX2V4ZWNsaXN0X2NvbnRleHQgKmxyYyA9ICZk ZXNjLT5scmNbZ3VjX2VuZ2luZV9pZF07CiAKIAkJLyogVE9ETzogV2UgaGF2ZSBhIGRlc2lnbiBp c3N1ZSB0byBiZSBzb2x2ZWQgaGVyZS4gT25seSB3aGVuIHdlCiAJCSAqIHJlY2VpdmUgdGhlIGZp cnN0IGJhdGNoLCB3ZSBrbm93IHdoaWNoIGVuZ2luZSBpcyB1c2VkIGJ5IHRoZQpAQCAtMjc3LDUw ICsyNjYsNDEgQEAgc3RhdGljIHZvaWQgZ3VjX2N0eF9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1 YyAqZ3VjLAogCQlscmMtPnJpbmdfbmV4dF9mcmVlX2xvY2F0aW9uID0gbHJjLT5yaW5nX2JlZ2lu OwogCQlscmMtPnJpbmdfY3VycmVudF90YWlsX3BvaW50ZXJfdmFsdWUgPSAwOwogCi0JCWRlc2Mu ZW5naW5lc191c2VkIHw9ICgxIDw8IGd1Y19lbmdpbmVfaWQpOworCQlkZXNjLT5lbmdpbmVzX3Vz ZWQgfD0gKDEgPDwgZ3VjX2VuZ2luZV9pZCk7CiAJfQogCiAJRFJNX0RFQlVHX0RSSVZFUigiSG9z dCBlbmdpbmVzIDB4JXggPT4gR3VDIGVuZ2luZXMgdXNlZCAweCV4XG4iLAotCQkJY2xpZW50LT5l bmdpbmVzLCBkZXNjLmVuZ2luZXNfdXNlZCk7Ci0JV0FSTl9PTihkZXNjLmVuZ2luZXNfdXNlZCA9 PSAwKTsKKwkJCWNsaWVudC0+ZW5naW5lcywgZGVzYy0+ZW5naW5lc191c2VkKTsKKwlXQVJOX09O KGRlc2MtPmVuZ2luZXNfdXNlZCA9PSAwKTsKIAogCS8qCiAJICogVGhlIGRvb3JiZWxsLCBwcm9j ZXNzIGRlc2NyaXB0b3IsIGFuZCB3b3JrcXVldWUgYXJlIGFsbCBwYXJ0cwogCSAqIG9mIHRoZSBj bGllbnQgb2JqZWN0LCB3aGljaCB0aGUgR3VDIHdpbGwgcmVmZXJlbmNlIHZpYSB0aGUgR0dUVAog CSAqLwogCWdmeF9hZGRyID0gZ3VjX2dndHRfb2Zmc2V0KGNsaWVudC0+dm1hKTsKLQlkZXNjLmRi X3RyaWdnZXJfcGh5ID0gc2dfZG1hX2FkZHJlc3MoY2xpZW50LT52bWEtPnBhZ2VzLT5zZ2wpICsK KwlkZXNjLT5kYl90cmlnZ2VyX3BoeSA9IHNnX2RtYV9hZGRyZXNzKGNsaWVudC0+dm1hLT5wYWdl cy0+c2dsKSArCiAJCQkJY2xpZW50LT5kb29yYmVsbF9vZmZzZXQ7Ci0JZGVzYy5kYl90cmlnZ2Vy X2NwdSA9Ci0JCSh1aW50cHRyX3QpY2xpZW50LT52YWRkciArIGNsaWVudC0+ZG9vcmJlbGxfb2Zm c2V0OwotCWRlc2MuZGJfdHJpZ2dlcl91ayA9IGdmeF9hZGRyICsgY2xpZW50LT5kb29yYmVsbF9v ZmZzZXQ7Ci0JZGVzYy5wcm9jZXNzX2Rlc2MgPSBnZnhfYWRkciArIGNsaWVudC0+cHJvY19kZXNj X29mZnNldDsKLQlkZXNjLndxX2FkZHIgPSBnZnhfYWRkciArIGNsaWVudC0+d3Ffb2Zmc2V0Owot CWRlc2Mud3Ffc2l6ZSA9IGNsaWVudC0+d3Ffc2l6ZTsKKwlkZXNjLT5kYl90cmlnZ2VyX2NwdSA9 ICh1aW50cHRyX3QpY2xpZW50LT52YWRkciArCisJCQkJY2xpZW50LT5kb29yYmVsbF9vZmZzZXQ7 CisJZGVzYy0+ZGJfdHJpZ2dlcl91ayA9IGdmeF9hZGRyICsgY2xpZW50LT5kb29yYmVsbF9vZmZz ZXQ7CisJZGVzYy0+cHJvY2Vzc19kZXNjID0gZ2Z4X2FkZHIgKyBjbGllbnQtPnByb2NfZGVzY19v ZmZzZXQ7CisJZGVzYy0+d3FfYWRkciA9IGdmeF9hZGRyICsgY2xpZW50LT53cV9vZmZzZXQ7CisJ ZGVzYy0+d3Ffc2l6ZSA9IGNsaWVudC0+d3Ffc2l6ZTsKIAogCS8qCiAJICogWFhYOiBUYWtlIExS Q3MgZnJvbSBhbiBleGlzdGluZyBjb250ZXh0IGlmIHRoaXMgaXMgbm90IGFuCiAJICogSXNLTURD cmVhdGVkQ29udGV4dCBjbGllbnQKIAkgKi8KLQlkZXNjLmRlc2NfcHJpdmF0ZSA9ICh1aW50cHRy X3QpY2xpZW50OwotCi0JLyogUG9vbCBjb250ZXh0IGlzIHBpbm5lZCBhbHJlYWR5ICovCi0Jc2cg PSBndWMtPmN0eF9wb29sX3ZtYS0+cGFnZXM7Ci0Jc2dfcGNvcHlfZnJvbV9idWZmZXIoc2ctPnNn bCwgc2ctPm5lbnRzLCAmZGVzYywgc2l6ZW9mKGRlc2MpLAotCQkJICAgICBzaXplb2YoZGVzYykg KiBjbGllbnQtPmN0eF9pbmRleCk7CisJZGVzYy0+ZGVzY19wcml2YXRlID0gKHVpbnRwdHJfdClj bGllbnQ7CiB9CiAKIHN0YXRpYyB2b2lkIGd1Y19jdHhfZGVzY19maW5pKHN0cnVjdCBpbnRlbF9n dWMgKmd1YywKIAkJCSAgICAgIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKIHsKLQlz dHJ1Y3QgZ3VjX2NvbnRleHRfZGVzYyBkZXNjOwotCXN0cnVjdCBzZ190YWJsZSAqc2c7CisJc3Ry dWN0IGd1Y19jb250ZXh0X2Rlc2MgKmRlc2M7CiAKLQltZW1zZXQoJmRlc2MsIDAsIHNpemVvZihk ZXNjKSk7Ci0KLQlzZyA9IGd1Yy0+Y3R4X3Bvb2xfdm1hLT5wYWdlczsKLQlzZ19wY29weV9mcm9t X2J1ZmZlcihzZy0+c2dsLCBzZy0+bmVudHMsICZkZXNjLCBzaXplb2YoZGVzYyksCi0JCQkgICAg IHNpemVvZihkZXNjKSAqIGNsaWVudC0+Y3R4X2luZGV4KTsKKwlkZXNjID0gZ3VjLT5jdHhfcG9v bF92YWRkciArIHNpemVvZigqZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleDsKKwltZW1zZXQoZGVz YywgMCwgc2l6ZW9mKCpkZXNjKSk7CiB9CiAKIC8qKgpAQCAtODc2LDYgKzg1Niw3IEBAIGludCBp OTE1X2d1Y19zdWJtaXNzaW9uX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWNvbnN0IHNpemVfdCBnZW1zaXplID0gcm91bmRfdXAocG9vbHNpemUsIFBBR0VfU0laRSk7 CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7CiAJc3RydWN0IGk5MTVf dm1hICp2bWE7CisJdm9pZCAqdmFkZHI7CiAKIAlpZiAoIUhBU19HVUNfU0NIRUQoZGV2X3ByaXYp KQogCQlyZXR1cm4gMDsKQEAgLTg5NSw2ICs4NzYsMTMgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Np b25faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXJldHVybiBQVFJf RVJSKHZtYSk7CiAKIAlndWMtPmN0eF9wb29sX3ZtYSA9IHZtYTsKKworCXZhZGRyID0gaTkxNV9n ZW1fb2JqZWN0X3Bpbl9tYXAodm1hLT5vYmosIEk5MTVfTUFQX1dCKTsKKwlpZiAoSVNfRVJSKHZh ZGRyKSkKKwkJZ290byBlcnI7CisKKwlndWMtPmN0eF9wb29sX3ZhZGRyID0gdmFkZHI7CisKIAlp ZGFfaW5pdCgmZ3VjLT5jdHhfaWRzKTsKIAlpbnRlbF9ndWNfbG9nX2NyZWF0ZShndWMpOwogCWd1 Y19hZGRvbl9jcmVhdGUoZ3VjKTsKQEAgLTk4Myw4ICs5NzEsMTEgQEAgdm9pZCBpOTE1X2d1Y19z dWJtaXNzaW9uX2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWk5MTVf dm1hX3VucGluX2FuZF9yZWxlYXNlKCZndWMtPmFkc192bWEpOwogCWk5MTVfdm1hX3VucGluX2Fu ZF9yZWxlYXNlKCZndWMtPmxvZy52bWEpOwogCi0JaWYgKGd1Yy0+Y3R4X3Bvb2xfdm1hKQorCWlm IChndWMtPmN0eF9wb29sX3ZhZGRyKSB7CiAJCWlkYV9kZXN0cm95KCZndWMtPmN0eF9pZHMpOwor CQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKGd1Yy0+Y3R4X3Bvb2xfdm1hLT5vYmopOworCX0K KwogCWk5MTVfdm1hX3VucGluX2FuZF9yZWxlYXNlKCZndWMtPmN0eF9wb29sX3ZtYSk7CiB9CiAK QEAgLTEwNDAsNSArMTAzMSwzIEBAIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEs IEFSUkFZX1NJWkUoZGF0YSkpOwogfQotCi0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCmluZGV4IDhh MzNhNDYuLjI5ZWUzNzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Vj LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaApAQCAtMTU1LDYgKzE1NSw3 IEBAIHN0cnVjdCBpbnRlbF9ndWMgewogCiAJc3RydWN0IGk5MTVfdm1hICphZHNfdm1hOwogCXN0 cnVjdCBpOTE1X3ZtYSAqY3R4X3Bvb2xfdm1hOworCXZvaWQgKmN0eF9wb29sX3ZhZGRyOwogCXN0 cnVjdCBpZGEgY3R4X2lkczsKIAogCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmV4ZWNidWZfY2xp ZW50OwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=