From: Tvrtko Ursulin Subject: [PATCH] drm/i915: More use of the cached LRC state Date: Fri, 22 Jan 2016 12:42:47 +0000 Message-ID: <1453466567-33369-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 407296E301 for ; Fri, 22 Jan 2016 04:43:03 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpbmNlOgoK Y29tbWl0IDgyMzUyZTkwOGFjZDM2ZDcyNDRjNzVhMDA4YzlmMjdhMmNlZDQ0ZDUKQXV0aG9yOiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpEYXRlOiAgIEZyaSBKYW4g MTUgMTc6MTI6NDUgMjAxNiArMDAwMAoKICAgIGRybS9pOTE1OiBDYWNoZSBMUkMgc3RhdGUgcGFn ZSBpbiB0aGUgY29udGV4dAoKYW5kOgoKY29tbWl0IDBlYjk3M2QzMWQwYWFkYjZiYzgwMWZkNmQ3 OTZhZmVjYmJmYzNkNWIKQXV0aG9yOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50 ZWwuY29tPgpEYXRlOiAgIEZyaSBKYW4gMTUgMTU6MTA6MjggMjAxNiArMDAwMAoKICAgIGRybS9p OTE1OiBDYWNoZSByaW5nYnVmZmVyIEdUVCBWTUEKCldlIGNhbiBhbHNvIHJlbW92ZSB0aGUgcmlu ZyBidWZmZXIgc3RhcnQgdXBkYXRlcyBvbiBldmVyeQpjb250ZXh0IHVwZGF0ZSBzaW5jZSB0aGUg YWRkcmVzcyB3aWxsIG5vdCBjaGFuZ2UgZm9yIHRoZQpkdXJhdGlvbiBvZiB0aGUgTFJDIHBpbi4K CkZvciBHdUMgd2UgY2FuIHJlbW92ZSB0aGUgdXBkYXRlIGFsdG9nZXRoZXIgYmVjYXVzZSBpdApv bmx5IGNhcmVzIGFib3V0IHRoZSByaW5nIGJ1ZmZlciBzdGFydC4KClNpZ25lZC1vZmYtYnk6IFR2 cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBBbGV4IERhaSA8eXUu ZGFpQGludGVsLmNvbT4KQ2M6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAyNyAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICB8 ICA2ICsrKystLQogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCAw NjgzMTVmYzc0MDQuLmVhMTVlMmQ5Mjg1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYwpAQCAtNTYwLDI5ICs1NjAsNiBAQCBzdGF0aWMgaW50IGd1Y19hZGRf d29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJcmV0dXJuIDA7CiB9 CiAKLSNkZWZpbmUgQ1RYX1JJTkdfQlVGRkVSX1NUQVJUCQkweDA4Ci0KLS8qIFVwZGF0ZSB0aGUg cmluZ2J1ZmZlciBwb2ludGVyIGluIGEgc2F2ZWQgY29udGV4dCBpbWFnZSAqLwotc3RhdGljIHZv aWQgbHJfY29udGV4dF91cGRhdGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKLXsK LQllbnVtIGludGVsX3JpbmdfaWQgcmluZ19pZCA9IHJxLT5yaW5nLT5pZDsKLQlzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9IHJxLT5jdHgtPmVuZ2luZVtyaW5nX2lkXS5zdGF0 ZTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqcmJfb2JqID0gcnEtPnJpbmdidWYtPm9i ajsKLQlzdHJ1Y3QgcGFnZSAqcGFnZTsKLQl1aW50MzJfdCAqcmVnX3N0YXRlOwotCi0JQlVHX09O KCFjdHhfb2JqKTsKLQlXQVJOX09OKCFpOTE1X2dlbV9vYmpfaXNfcGlubmVkKGN0eF9vYmopKTsK LQlXQVJOX09OKCFpOTE1X2dlbV9vYmpfaXNfcGlubmVkKHJiX29iaikpOwotCi0JcGFnZSA9IGk5 MTVfZ2VtX29iamVjdF9nZXRfZGlydHlfcGFnZShjdHhfb2JqLCBMUkNfU1RBVEVfUE4pOwotCXJl Z19zdGF0ZSA9IGttYXBfYXRvbWljKHBhZ2UpOwotCi0JcmVnX3N0YXRlW0NUWF9SSU5HX0JVRkZF Ul9TVEFSVCsxXSA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChyYl9vYmopOwotCi0Ja3VubWFw X2F0b21pYyhyZWdfc3RhdGUpOwotfQotCiAvKioKICAqIGk5MTVfZ3VjX3N1Ym1pdCgpIC0gU3Vi bWl0IGNvbW1hbmRzIHRocm91Z2ggR3VDCiAgKiBAY2xpZW50Ogl0aGUgZ3VjIGNsaWVudCB3aGVy ZSBjb21tYW5kcyB3aWxsIGdvIHRocm91Z2gKQEAgLTU5NywxMCArNTc0LDYgQEAgaW50IGk5MTVf Z3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQsCiAJZW51bSBpbnRlbF9y aW5nX2lkIHJpbmdfaWQgPSBycS0+cmluZy0+aWQ7CiAJaW50IHFfcmV0LCBiX3JldDsKIAotCS8q IE5lZWQgdGhpcyBiZWNhdXNlIG9mIHRoZSBkZWZlcnJlZCBwaW4gY3R4IGFuZCByaW5nICovCi0J LyogU2hhbGwgd2UgbW92ZSB0aGlzIHJpZ2h0IGFmdGVyIHJpbmcgaXMgcGlubmVkPyAqLwotCWxy X2NvbnRleHRfdXBkYXRlKHJxKTsKLQogCXFfcmV0ID0gZ3VjX2FkZF93b3JrcXVldWVfaXRlbShj bGllbnQsIHJxKTsKIAlpZiAocV9yZXQgPT0gMCkKIAkJYl9yZXQgPSBndWNfcmluZ19kb29yYmVs bChjbGllbnQpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA3ZjQ3OTQ4ZDVjNDAuLjQz Yzk0YWY0YjgxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTM5Myw3ICszOTMsNiBA QCBzdGF0aWMgaW50IGV4ZWNsaXN0c191cGRhdGVfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJxKQogCXVpbnQzMl90ICpyZWdfc3RhdGUgPSBycS0+Y3R4LT5lbmdpbmVbcmlu Zy0+aWRdLmxyY19yZWdfc3RhdGU7CiAKIAlyZWdfc3RhdGVbQ1RYX1JJTkdfVEFJTCsxXSA9IHJx LT50YWlsOwotCXJlZ19zdGF0ZVtDVFhfUklOR19CVUZGRVJfU1RBUlQrMV0gPSBycS0+cmluZ2J1 Zi0+dm1hLT5ub2RlLnN0YXJ0OwogCiAJaWYgKHBwZ3R0ICYmICFVU0VTX0ZVTExfNDhCSVRfUFBH VFQocHBndHQtPmJhc2UuZGV2KSkgewogCQkvKiBUcnVlIDMyYiBQUEdUVCB3aXRoIGR5bmFtaWMg cGFnZSBhbGxvY2F0aW9uOiB1cGRhdGUgUERQCkBAIC0xMDY3LDYgKzEwNjYsNyBAQCBzdGF0aWMg aW50IGludGVsX2xyX2NvbnRleHRfZG9fcGluKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPSBjdHgtPmVuZ2luZVtyaW5n LT5pZF0uc3RhdGU7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBjdHgtPmVu Z2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKIAlzdHJ1Y3QgcGFnZSAqbHJjX3N0YXRlX3BhZ2U7CisJ dWludDMyX3QgKmxyY19yZWdfc3RhdGU7CiAJaW50IHJldDsKIAogCVdBUk5fT04oIW11dGV4X2lz X2xvY2tlZCgmcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKQEAgLTEwODgsNyArMTA4OCw5IEBA IHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4dF9kb19waW4oc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywKIAogCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNfdm1hID0gaTkxNV9nZW1fb2Jq X3RvX2dndHQoY3R4X29iaik7CiAJaW50ZWxfbHJfY29udGV4dF9kZXNjcmlwdG9yX3VwZGF0ZShj dHgsIHJpbmcpOwotCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNfcmVnX3N0YXRlID0ga21hcChs cmNfc3RhdGVfcGFnZSk7CisJbHJjX3JlZ19zdGF0ZSA9IGttYXAobHJjX3N0YXRlX3BhZ2UpOwor CWxyY19yZWdfc3RhdGVbQ1RYX1JJTkdfQlVGRkVSX1NUQVJUKzFdID0gcmluZ2J1Zi0+dm1hLT5u b2RlLnN0YXJ0OworCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5scmNfcmVnX3N0YXRlID0gbHJjX3Jl Z19zdGF0ZTsKIAljdHhfb2JqLT5kaXJ0eSA9IHRydWU7CiAKIAkvKiBJbnZhbGlkYXRlIEd1QyBU TEIuICovCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK