From: Tvrtko Ursulin Subject: [PATCH 1/3] drm/i915: Make LRC (un)pinning work on context and engine Date: Wed, 20 Jan 2016 13:40:55 +0000 Message-ID: <1453297257-4707-1-git-send-email-tvrtko.ursulin@linux.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 3C22289C37 for ; Wed, 20 Jan 2016 05:41:01 -0800 (PST) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClByZXZpb3Vz bHkgaW50ZWxfbHJfY29udGV4dF8odW4pcGluIHdlcmUgb3BlcmF0aW5nIG9uIHJlcXVlc3RzCndo aWNoIGlzIGluIGNvbmZsaWN0IHdpdGggdGhlaXIgbmFtZXMuCgpJZiB3ZSBtYWtlIHRoZW0gdGFr ZSBhIGNvbnRleHQgYW5kIGFuIGVuZ2luZSwgaXQgbWFrZXMgdGhlIG5hbWVzCm1ha2UgbW9yZSBz ZW5zZSBhbmQgaXQgYWxzbyBtYWtlcyBmdXR1cmUgZml4ZXMgcG9zc2libGUuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMg V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBOaWNrIEhvYXRoIDxuaWNob2xh cy5ob2F0aEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCA0OCArKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuaCB8ICAzICsrLQogMyBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAyNiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA2YjAxMDJkYTg1OWMuLmE3 NTJiMDBkNGZmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNjgxLDcgKzI2ODEsNyBA QCB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfZnJlZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZikKIAlpZiAo Y3R4KSB7CiAJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKIAkJCWlmIChjdHggIT0gcmVx LT5yaW5nLT5kZWZhdWx0X2NvbnRleHQpCi0JCQkJaW50ZWxfbHJfY29udGV4dF91bnBpbihyZXEp OworCQkJCWludGVsX2xyX2NvbnRleHRfdW5waW4oY3R4LCByZXEtPnJpbmcpOwogCQl9CiAKIAkJ aTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShjdHgpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YwppbmRleCBmYWFmNDkwNzdmZWEuLjQ4Y2E1MWEzNjk0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKQEAgLTIyNSw3ICsyMjUsOCBAQCBlbnVtIHsKICNkZWZpbmUgR0VOOF9DVFhfSURfU0hJ RlQgMzIKICNkZWZpbmUgQ1RYX1JDU19JTkRJUkVDVF9DVFhfT0ZGU0VUX0RFRkFVTFQgIDB4MTcK IAotc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJxKTsKK3N0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9waW4oc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCwKKwkJCQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogc3Rh dGljIHZvaWQgbHJjX3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpkZWZhdWx0X2N0eF9v YmopOwogCkBAIC01OTksNyArNjAwLDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9x dWV1ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJaW50IG51bV9lbGVt ZW50cyA9IDA7CiAKIAlpZiAocmVxdWVzdC0+Y3R4ICE9IHJpbmctPmRlZmF1bHRfY29udGV4dCkK LQkJaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdCk7CisJCWludGVsX2xyX2NvbnRleHRfcGlu KHJlcXVlc3QtPmN0eCwgcmluZyk7CiAKIAlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXF1 ZXN0KTsKIApAQCAtNjkxLDcgKzY5Miw3IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2Nf cmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0CiAJcmVx dWVzdC0+cmluZ2J1ZiA9IHJlcXVlc3QtPmN0eC0+ZW5naW5lW3JlcXVlc3QtPnJpbmctPmlkXS5y aW5nYnVmOwogCiAJaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5yaW5nLT5kZWZhdWx0X2Nv bnRleHQpIHsKLQkJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdCk7CisJCXJldCA9 IGludGVsX2xyX2NvbnRleHRfcGluKHJlcXVlc3QtPmN0eCwgcmVxdWVzdC0+cmluZyk7CiAJCWlm IChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0KQEAgLTEwMDcsNyArMTAwOCw3IEBAIHZvaWQgaW50 ZWxfZXhlY2xpc3RzX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KQogCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0ZTsKIAogCQlpZiAoY3R4X29iaiAmJiAo Y3R4ICE9IHJpbmctPmRlZmF1bHRfY29udGV4dCkpCi0JCQlpbnRlbF9scl9jb250ZXh0X3VucGlu KHJlcSk7CisJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKGN0eCwgcmluZyk7CiAJCWxpc3RfZGVs KCZyZXEtPmV4ZWNsaXN0X2xpbmspOwogCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJl cSk7CiAJfQpAQCAtMTA1MSw4ICsxMDUyLDggQEAgaW50IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxf Y2FjaGVzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCXJldHVybiAwOwogfQog Ci1zdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfZG9fcGluKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsCi0JCQkJICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKK3N0YXRpYyBpbnQg aW50ZWxfbHJfY29udGV4dF9kb19waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCQkg ICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKQEAgLTEwOTUsNDEgKzEwOTYsNDAgQEAgdW5waW5fY3R4X29iajoKIAly ZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcGluKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCitzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcGlu KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCisJCQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogewogCWludCByZXQgPSAwOwotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcg PSBycS0+cmluZzsKIAotCWlmIChycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCsr ID09IDApIHsKLQkJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9kb19waW4ocmluZywgcnEtPmN0eCk7 CisJaWYgKGN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnBpbl9jb3VudCsrID09IDApIHsKKwkJcmV0 ID0gaW50ZWxfbHJfY29udGV4dF9kb19waW4oY3R4LCBlbmdpbmUpOwogCQlpZiAocmV0KQogCQkJ Z290byByZXNldF9waW5fY291bnQ7CiAJfQogCXJldHVybiByZXQ7CiAKIHJlc2V0X3Bpbl9jb3Vu dDoKLQlycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCA9IDA7CisJY3R4LT5lbmdp bmVbZW5naW5lLT5pZF0ucGluX2NvdW50ID0gMDsKIAlyZXR1cm4gcmV0OwogfQogCi12b2lkIGlu dGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKK3Zv aWQgaW50ZWxfbHJfY29udGV4dF91bnBpbihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCQkJ ICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nID0gcnEtPnJpbmc7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0 eF9vYmogPSBycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwotCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmID0gcnEtPnJpbmdidWY7CisJc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5zdGF0ZTsKIAotCVdBUk5f T04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKKwlXQVJOX09O KCFtdXRleF9pc19sb2NrZWQoJmVuZ2luZS0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKIAotCWlmICgh Y3R4X29iaikKKwlpZiAoV0FSTl9PTl9PTkNFKCFjdHhfb2JqKSkKIAkJcmV0dXJuOwogCi0JaWYg KC0tcnEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5waW5fY291bnQgPT0gMCkgewotCQlrdW5tYXAo a21hcF90b19wYWdlKHJxLT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0ubHJjX3JlZ19zdGF0ZSkpOwot CQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKKwlpZiAoLS1jdHgtPmVuZ2lu ZVtlbmdpbmUtPmlkXS5waW5fY291bnQgPT0gMCkgeworCQlrdW5tYXAoa21hcF90b19wYWdlKGN0 eC0+ZW5naW5lW2VuZ2luZS0+aWRdLmxyY19yZWdfc3RhdGUpKTsKKwkJaW50ZWxfdW5waW5fcmlu Z2J1ZmZlcl9vYmooY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ucmluZ2J1Zik7CiAJCWk5MTVfZ2Vt X29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwotCQlycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRd LmxyY192bWEgPSBOVUxMOwotCQlycS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLmxyY19kZXNjID0g MDsKLQkJcnEtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNfcmVnX3N0YXRlID0gTlVMTDsKKwkJ Y3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ubHJjX3ZtYSA9IE5VTEw7CisJCWN0eC0+ZW5naW5lW2Vu Z2luZS0+aWRdLmxyY19kZXNjID0gMDsKKwkJY3R4LT5lbmdpbmVbZW5naW5lLT5pZF0ubHJjX3Jl Z19zdGF0ZSA9IE5VTEw7CiAJfQogfQogCkBAIC0yMDMyLDcgKzIwMzIsNyBAQCBsb2dpY2FsX3Jp bmdfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nKQogCQlnb3RvIGVycm9yOwogCiAJLyogQXMgdGhpcyBpcyB0aGUgZGVmYXVsdCBjb250ZXh0 LCBhbHdheXMgcGluIGl0ICovCi0JcmV0ID0gaW50ZWxfbHJfY29udGV4dF9kb19waW4ocmluZywg cmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKKwlyZXQgPSBpbnRlbF9scl9jb250ZXh0X2RvX3Bpbihy aW5nLT5kZWZhdWx0X2NvbnRleHQsIHJpbmcpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKAog CQkJIkZhaWxlZCB0byBwaW4gYW5kIG1hcCByaW5nYnVmZmVyICVzOiAlZFxuIiwKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmgKaW5kZXggNDlhZjYzOGY2MjEzLi5lNmNkYTNlMjI1ZDAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5oCkBAIC0xMDEsNyArMTAxLDggQEAgdm9pZCBpbnRlbF9scl9jb250 ZXh0X2ZyZWUoc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiB1aW50MzJfdCBpbnRlbF9scl9j b250ZXh0X3NpemUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaW50ZWxfbHJf Y29udGV4dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCSAg ICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKLXZvaWQgaW50ZWxfbHJfY29udGV4dF91 bnBpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7Cit2b2lkIGludGVsX2xyX2Nv bnRleHRfdW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCSAgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpOwogdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc2V0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKIHVpbnQ2 NF90IGludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcihzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4 LAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==