From: Nick Hoath Subject: [PATCH 5/6] drm/i915: Add the CPU mapping of the hw context to the pinned items. Date: Tue, 20 Oct 2015 10:23:55 +0100 Message-ID: <1445333036-22164-6-git-send-email-nicholas.hoath@intel.com> References: <1445333036-22164-1-git-send-email-nicholas.hoath@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id F1B6E6E71B for ; Tue, 20 Oct 2015 02:28:04 -0700 (PDT) In-Reply-To: <1445333036-22164-1-git-send-email-nicholas.hoath@intel.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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org UGluIHRoZSBodyBjdHggbWFwcGluZyBzbyB0aGF0IGl0IGlzIG5vdCBtYXBwZWQvdW5tYXBwZWQg cGVyIGJiCndoZW4gZG9pbmcgR3VDIHN1Ym1pc3Npb24uCgp2MjogUmVtb3ZlZCBpbnRlcmltIGRl dmVsb3BtZW50IGV4dHJhIG1hcHBpbmcuIChEYW5pZWwgVmV0dGVyKQoKSXNzdWU6IFZJWi00Mjc3 ClNpZ25lZC1vZmYtYnk6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVsLmNvbT4KQ2M6 IERhdmlkIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYyB8IDE0ICsrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICAgICB8ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgIHwg NDYgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCA0MCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCmluZGV4IGEzYjIyYmQuLmYwYTE3MmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZGVidWdmcy5jCkBAIC0xOTcwLDEwICsxOTcwLDkgQEAgc3RhdGljIGludCBpOTE1X2NvbnRleHRf c3RhdHVzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCiBzdGF0aWMgdm9pZCBp OTE1X2R1bXBfbHJjX29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sCiAJCQkgICAgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg KmN0eF9vYmopCisJCQkgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiwK KwkJCSAgICAgIHVpbnQzMl90ICpyZWdfc3RhdGUpCiB7Ci0Jc3RydWN0IHBhZ2UgKnBhZ2U7Ci0J dWludDMyX3QgKnJlZ19zdGF0ZTsKIAlpbnQgajsKIAl1bnNpZ25lZCBsb25nIGdndHRfb2Zmc2V0 ID0gMDsKIApAQCAtMTk5NiwxNyArMTk5NSwxMyBAQCBzdGF0aWMgdm9pZCBpOTE1X2R1bXBfbHJj X29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sCiAJCXJldHVybjsKIAl9CiAKLQlwYWdlID0gaTkxNV9n ZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmosIExSQ19TVEFURV9QTik7Ci0JaWYgKCFXQVJOX09O KHBhZ2UgPT0gTlVMTCkpIHsKLQkJcmVnX3N0YXRlID0ga21hcF9hdG9taWMocGFnZSk7Ci0KKwlp ZiAoIVdBUk5fT04ocmVnX3N0YXRlID09IE5VTEwpKSB7CiAJCWZvciAoaiA9IDA7IGogPCAweDYw MCAvIHNpemVvZih1MzIpIC8gNDsgaiArPSA0KSB7CiAJCQlzZXFfcHJpbnRmKG0sICJcdFsweCUw OGx4XSAweCUwOHggMHglMDh4IDB4JTA4eCAweCUwOHhcbiIsCiAJCQkJICAgZ2d0dF9vZmZzZXQg KyA0MDk2ICsgKGogKiA0KSwKIAkJCQkgICByZWdfc3RhdGVbal0sIHJlZ19zdGF0ZVtqICsgMV0s CiAJCQkJICAgcmVnX3N0YXRlW2ogKyAyXSwgcmVnX3N0YXRlW2ogKyAzXSk7CiAJCX0KLQkJa3Vu bWFwX2F0b21pYyhyZWdfc3RhdGUpOwogCX0KIAogCXNlcV9wdXRjKG0sICdcbicpOwpAQCAtMjAz NCw3ICsyMDI5LDggQEAgc3RhdGljIGludCBpOTE1X2R1bXBfbHJjKHN0cnVjdCBzZXFfZmlsZSAq bSwgdm9pZCAqdW51c2VkKQogCQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7CiAJ CQlpZiAocmluZy0+ZGVmYXVsdF9jb250ZXh0ICE9IGN0eCkKIAkJCQlpOTE1X2R1bXBfbHJjX29i aihtLCByaW5nLAotCQkJCQkJICBjdHgtPmVuZ2luZVtpXS5zdGF0ZSk7CisJCQkJCQkgIGN0eC0+ ZW5naW5lW2ldLnN0YXRlLAorCQkJCQkJICBjdHgtPmVuZ2luZVtpXS5yZWdfc3RhdGUpOwogCQl9 CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAwZGQ0YWNlLi5kYzY5ZDY3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTg4MSw4ICs4ODEsMTAgQEAgc3RydWN0IGludGVsX2Nv bnRleHQgewogCX0gbGVnYWN5X2h3X2N0eDsKIAogCS8qIEV4ZWNsaXN0cyAqLwotCXN0cnVjdCB7 CisJc3RydWN0IGludGVsX2NvbnRleHRfZW5naW5lIHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKnN0YXRlOworCQl1aW50MzJfdCAqcmVnX3N0YXRlOworCQlzdHJ1Y3QgcGFnZSAqcGFn ZTsKIAkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJCWludCBwaW5fY291bnQ7 CiAJfSBlbmdpbmVbSTkxNV9OVU1fUklOR1NdOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRl eCAwNjk5NTBlLi5hMzVlZmNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMzYwLDE2 ICszNjAsMTMgQEAgc3RhdGljIGludCBleGVjbGlzdHNfdXBkYXRlX2NvbnRleHQoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIAlzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQgPSBy cS0+Y3R4LT5wcGd0dDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9IHJx LT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGU7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKnJiX29iaiA9IHJxLT5yaW5nYnVmLT5vYmo7Ci0Jc3RydWN0IHBhZ2UgKnBhZ2U7Ci0JdWlu dDMyX3QgKnJlZ19zdGF0ZTsKKwl1aW50MzJfdCAqcmVnX3N0YXRlID0gcnEtPmN0eC0+ZW5naW5l W3JpbmctPmlkXS5yZWdfc3RhdGU7CiAKIAlCVUdfT04oIWN0eF9vYmopOworCVdBUk5fT04oIXJl Z19zdGF0ZSk7CiAJV0FSTl9PTighaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChjdHhfb2JqKSk7CiAJ V0FSTl9PTighaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChyYl9vYmopKTsKIAotCXBhZ2UgPSBpOTE1 X2dlbV9vYmplY3RfZ2V0X3BhZ2UoY3R4X29iaiwgTFJDX1NUQVRFX1BOKTsKLQlyZWdfc3RhdGUg PSBrbWFwX2F0b21pYyhwYWdlKTsKLQogCXJlZ19zdGF0ZVtDVFhfUklOR19UQUlMKzFdID0gcnEt PnRhaWw7CiAJcmVnX3N0YXRlW0NUWF9SSU5HX0JVRkZFUl9TVEFSVCsxXSA9IGk5MTVfZ2VtX29i al9nZ3R0X29mZnNldChyYl9vYmopOwogCkBAIC0zODUsOCArMzgyLDYgQEAgc3RhdGljIGludCBl eGVjbGlzdHNfdXBkYXRlX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkK IAkJQVNTSUdOX0NUWF9QRFAocHBndHQsIHJlZ19zdGF0ZSwgMCk7CiAJfQogCi0Ja3VubWFwX2F0 b21pYyhyZWdfc3RhdGUpOwotCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTk4NSw3ICs5ODAsMzEgQEAg aW50IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRf ZG9fcGluKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCitzdGF0aWMgaW50IGludGVsX21t YXBfaHdfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQlib29sIHVu bWFwKQoreworCWludCByZXQgPSAwOworCXN0cnVjdCBpbnRlbF9jb250ZXh0X2VuZ2luZSAqaWNl ID0KKwkJCShzdHJ1Y3QgaW50ZWxfY29udGV4dF9lbmdpbmUgKilvYmotPm1hcHBhYmxlOworCXN0 cnVjdCBwYWdlICpwYWdlOworCXVpbnQzMl90ICpyZWdfc3RhdGU7CisKKwlpZiAodW5tYXApIHsK KwkJa3VubWFwKGljZS0+cGFnZSk7CisJCWljZS0+cmVnX3N0YXRlID0gTlVMTDsKKwkJaWNlLT5w YWdlID0gTlVMTDsKKwl9IGVsc2UgeworCQlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdl KG9iaiwgTFJDX1NUQVRFX1BOKTsKKwkJcmVnX3N0YXRlID0ga21hcChwYWdlKTsKKwkJaWNlLT5y ZWdfc3RhdGUgPSByZWdfc3RhdGU7CisJCWljZS0+cGFnZSA9IHBhZ2U7CisJfQorCXJldHVybiBy ZXQ7Cit9CisKK3N0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9kb19waW4oCisJCXN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHgsCisJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqLAogCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZikKIHsKQEAgLTEwMzIsNyArMTA1MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf bHJfY29udGV4dF9waW4oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIAlzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJxLT5yaW5nYnVmOwogCiAJaWYgKHJxLT5jdHgt PmVuZ2luZVtyaW5nLT5pZF0ucGluX2NvdW50KysgPT0gMCkgewotCQlyZXQgPSBpbnRlbF9scl9j b250ZXh0X2RvX3BpbihyaW5nLCBjdHhfb2JqLCByaW5nYnVmKTsKKwkJcmV0ID0gaW50ZWxfbHJf Y29udGV4dF9kb19waW4ocnEtPmN0eCwgcmluZywgY3R4X29iaiwgcmluZ2J1Zik7CiAJCWlmIChy ZXQpCiAJCQlnb3RvIHJlc2V0X3Bpbl9jb3VudDsKIAl9CkBAIC0xOTIxLDYgKzE5NDAsNyBAQCBz dGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbgogCiAJLyogQXMgdGhpcyBpcyB0aGUgZGVmYXVsdCBjb250 ZXh0LCBhbHdheXMgcGluIGl0ICovCiAJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9kb19waW4oCisJ CQlyaW5nLT5kZWZhdWx0X2NvbnRleHQsCiAJCQlyaW5nLAogCQkJcmluZy0+ZGVmYXVsdF9jb250 ZXh0LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlLAogCQkJcmluZy0+ZGVmYXVsdF9jb250ZXh0LT5l bmdpbmVbcmluZy0+aWRdLnJpbmdidWYpOwpAQCAtMjQ3MSw2ICsyNDkxLDggQEAgaW50IGludGVs X2xyX2NvbnRleHRfZGVmZXJyZWRfYWxsb2Moc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJ Z290byBlcnJvcl9yaW5nYnVmOwogCX0KIAorCWN0eF9vYmotPm1tYXAgPSBpbnRlbF9tbWFwX2h3 X2NvbnRleHQ7CisJY3R4X29iai0+bWFwcGFibGUgPSAmKGN0eC0+ZW5naW5lW3JpbmctPmlkXSk7 CiAJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWYgPSByaW5nYnVmOwogCWN0eC0+ZW5naW5l W3JpbmctPmlkXS5zdGF0ZSA9IGN0eF9vYmo7CiAKQEAgLTI1MTgsNyArMjU0MCw2IEBAIHZvaWQg aW50ZWxfbHJfY29udGV4dF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9CiAJCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJp bmdidWY7CiAJCXVpbnQzMl90ICpyZWdfc3RhdGU7Ci0JCXN0cnVjdCBwYWdlICpwYWdlOwogCiAJ CWlmICghY3R4X29iaikKIAkJCWNvbnRpbnVlOwpAQCAtMjUyNywxNCArMjU0OCwxMSBAQCB2b2lk IGludGVsX2xyX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCVdBUk4o MSwgIkZhaWxlZCBnZXRfcGFnZXMgZm9yIGNvbnRleHQgb2JqXG4iKTsKIAkJCWNvbnRpbnVlOwog CQl9Ci0JCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoY3R4X29iaiwgTFJDX1NUQVRF X1BOKTsKLQkJcmVnX3N0YXRlID0ga21hcF9hdG9taWMocGFnZSk7CisJCXJlZ19zdGF0ZSA9IGN0 eC0+ZW5naW5lW3JpbmctPmlkXS5yZWdfc3RhdGU7CiAKIAkJcmVnX3N0YXRlW0NUWF9SSU5HX0hF QUQrMV0gPSAwOwogCQlyZWdfc3RhdGVbQ1RYX1JJTkdfVEFJTCsxXSA9IDA7CiAKLQkJa3VubWFw X2F0b21pYyhyZWdfc3RhdGUpOwotCiAJCXJpbmdidWYtPmhlYWQgPSAwOwogCQlyaW5nYnVmLT50 YWlsID0gMDsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==