From: Tvrtko Ursulin Subject: [PATCH v5] drm/i915: Cache LRC state page in the context Date: Fri, 15 Jan 2016 16:39:29 +0000 Message-ID: <1452875969-20246-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <20160115161704.GA27877@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A1896EBC3 for ; Fri, 15 Jan 2016 08:39:34 -0800 (PST) In-Reply-To: <20160115161704.GA27877@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkxSQyBsaWZl dGltZSBpcyB3ZWxsIGRlZmluZWQgc28gd2UgY2FuIGNhY2hlIHRoZSBwYWdlIHBvaW50aW5nCnRv IHRoZSBvYmplY3QgYmFja2luZyBzdG9yZSBpbiB0aGUgY29udGV4dCBpbiBvcmRlciB0byBhdm9p ZAp3YWxraW5nIG92ZXIgdGhlIG9iamVjdCBTRyBwYWdlIGxpc3QgZnJvbSB0aGUgaW50ZXJydXB0 IGNvbnRleHQKd2l0aG91dCB0aGUgYmlnIGxvY2sgaGVsZC4KCnYyOiBBbHNvIGNhY2hlIHRoZSBt YXBwaW5nLiAoQ2hyaXMgV2lsc29uKQp2MzogVW5tYXAgb24gdGhlIGVycm9yIHBhdGguCnY0OiBO byBuZWVkIHRvIGNhY2hlIHRoZSBwYWdlLiAoQ2hyaXMgV2lsc29uKQp2NTogTm8gbmVlZCB0byBk aXJ0eSB0aGUgcGFnZSBvbiB1bnBpbi4gKENocmlzIFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IFR2 cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRv bkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgfCAgMSAr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8IDUzICsrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygr KSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggYWNmZjk4Yjlj MTQ4Li5hZjMwMTQ4MmU2ZjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtODkwLDYgKzg5 MCw3IEBAIHN0cnVjdCBpbnRlbF9jb250ZXh0IHsKIAkJaW50IHBpbl9jb3VudDsKIAkJc3RydWN0 IGk5MTVfdm1hICpscmNfdm1hOwogCQl1NjQgbHJjX2Rlc2M7CisJCXVpbnQzMl90ICpscmNfcmVn X3N0YXRlOwogCX0gZW5naW5lW0k5MTVfTlVNX1JJTkdTXTsKIAogCXN0cnVjdCBsaXN0X2hlYWQg bGluazsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNTQ1MTczYzFiNWM1Li5kYzNlYTAz YTg4N2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0zOTAsMTQgKzM5MCw3IEBAIHN0 YXRpYyBpbnQgZXhlY2xpc3RzX3VwZGF0ZV9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcnEpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJxLT5yaW5nOwog CXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IHJxLT5jdHgtPnBwZ3R0OwotCXN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gcnEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5z dGF0ZTsKLQlzdHJ1Y3QgcGFnZSAqcGFnZTsKLQl1aW50MzJfdCAqcmVnX3N0YXRlOwotCi0JQlVH X09OKCFjdHhfb2JqKTsKLQotCXBhZ2UgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X2RpcnR5X3BhZ2Uo Y3R4X29iaiwgTFJDX1NUQVRFX1BOKTsKLQlyZWdfc3RhdGUgPSBrbWFwX2F0b21pYyhwYWdlKTsK Kwl1aW50MzJfdCAqcmVnX3N0YXRlID0gcnEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNfcmVn X3N0YXRlOwogCiAJcmVnX3N0YXRlW0NUWF9SSU5HX1RBSUwrMV0gPSBycS0+dGFpbDsKIAlyZWdf c3RhdGVbQ1RYX1JJTkdfQlVGRkVSX1NUQVJUKzFdID0gcnEtPnJpbmdidWYtPnZtYS0+bm9kZS5z dGFydDsKQEAgLTQxNCw4ICs0MDcsNiBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c191cGRhdGVfY29u dGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogCQlBU1NJR05fQ1RYX1BEUChw cGd0dCwgcmVnX3N0YXRlLCAwKTsKIAl9CiAKLQlrdW5tYXBfYXRvbWljKHJlZ19zdGF0ZSk7Ci0K IAlyZXR1cm4gMDsKIH0KIApAQCAtMTA2Nyw2ICsxMDU4LDggQEAgc3RhdGljIGludCBpbnRlbF9s cl9jb250ZXh0X2RvX3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGU7 CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjdHgtPmVuZ2luZVtyaW5nLT5p ZF0ucmluZ2J1ZjsKKwlzdHJ1Y3QgcGFnZSAqbHJjX3N0YXRlX3BhZ2U7CisJdWludDMyX3QgKmxy Y19yZWdfc3RhdGU7CiAJaW50IHJldDsKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmlu Zy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKQEAgLTEwNzYsMTIgKzEwNjksMjUgQEAgc3RhdGljIGlu dCBpbnRlbF9scl9jb250ZXh0X2RvX3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKKwlscmNfc3RhdGVfcGFnZSA9IGk5MTVfZ2VtX29i amVjdF9nZXRfZGlydHlfcGFnZShjdHhfb2JqLCBMUkNfU1RBVEVfUE4pOworCWlmIChXQVJOX09O KCFscmNfc3RhdGVfcGFnZSkpIHsKKwkJcmV0ID0gLUVOT0RFVjsKKwkJZ290byB1bnBpbl9jdHhf b2JqOworCX0KKworCWxyY19yZWdfc3RhdGUgPSBrbWFwKGxyY19zdGF0ZV9wYWdlKTsKKwlpZiAo IWxyY19yZWdfc3RhdGUpIHsKKwkJcmV0ID0gLUVOT01FTTsKKwkJZ290byB1bnBpbl9jdHhfb2Jq OworCX0KKwogCXJldCA9IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKHJpbmctPmRl diwgcmluZ2J1Zik7CiAJaWYgKHJldCkKLQkJZ290byB1bnBpbl9jdHhfb2JqOworCQlnb3RvIHVu bWFwX3N0YXRlX3BhZ2U7CiAKIAljdHgtPmVuZ2luZVtyaW5nLT5pZF0ubHJjX3ZtYSA9IGk5MTVf Z2VtX29ial90b19nZ3R0KGN0eF9vYmopOwogCWludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcl91 cGRhdGUoY3R4LCByaW5nKTsKKwljdHgtPmVuZ2luZVtyaW5nLT5pZF0ubHJjX3JlZ19zdGF0ZSA9 IGxyY19yZWdfc3RhdGU7CiAJY3R4X29iai0+ZGlydHkgPSB0cnVlOwogCiAJLyogSW52YWxpZGF0 ZSBHdUMgVExCLiAqLwpAQCAtMTA5MCw2ICsxMDk2LDggQEAgc3RhdGljIGludCBpbnRlbF9scl9j b250ZXh0X2RvX3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCiAJcmV0dXJuIHJl dDsKIAordW5tYXBfc3RhdGVfcGFnZToKKwlrdW5tYXAobHJjX3N0YXRlX3BhZ2UpOwogdW5waW5f Y3R4X29iajoKIAlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKIApAQCAtMTEx OCwxNSArMTEyNiwyMiBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpycSkKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcnEt PnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPSBycS0+Y3R4LT5l bmdpbmVbcmluZy0+aWRdLnN0YXRlOwogCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVm ID0gcnEtPnJpbmdidWY7CisJc3RydWN0IHBhZ2UgKmxyY19zdGF0ZV9wYWdlOwogCi0JaWYgKGN0 eF9vYmopIHsKLQkJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyaW5nLT5kZXYtPnN0cnVjdF9t dXRleCkpOwotCQlpZiAoLS1ycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCA9PSAw KSB7Ci0JCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKLQkJCWk5MTVfZ2Vt X29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwotCQkJcnEtPmN0eC0+ZW5naW5lW3JpbmctPmlk XS5scmNfdm1hID0gTlVMTDsKLQkJCXJxLT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0ubHJjX2Rlc2Mg PSAwOwotCQl9CisJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyaW5nLT5kZXYtPnN0cnVjdF9t dXRleCkpOworCisJaWYgKCFjdHhfb2JqKQorCQlyZXR1cm47CisKKwlpZiAoLS1ycS0+Y3R4LT5l bmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCA9PSAwKSB7CisJCWxyY19zdGF0ZV9wYWdlID0gaTkx NV9nZW1fb2JqZWN0X2dldF9wYWdlKGN0eF9vYmosCisJCQkJCQkJICBMUkNfU1RBVEVfUE4pOwor CQlrdW5tYXAobHJjX3N0YXRlX3BhZ2UpOworCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihy aW5nYnVmKTsKKwkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29iaik7CisJCXJxLT5j dHgtPmVuZ2luZVtyaW5nLT5pZF0ubHJjX3ZtYSA9IE5VTEw7CisJCXJxLT5jdHgtPmVuZ2luZVty aW5nLT5pZF0ubHJjX2Rlc2MgPSAwOworCQlycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLmxyY19y ZWdfc3RhdGUgPSBOVUxMOwogCX0KIH0KIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==