From: Tvrtko Ursulin Subject: [PATCH 1/2] drm/i915: Split execlists hardware status page initialisation from setup Date: Tue, 12 Apr 2016 15:40:41 +0100 Message-ID: <1460472042-1998-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 7EB266E393 for ; Tue, 12 Apr 2016 14:40:46 +0000 (UTC) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNwbGl0IHRo ZSBoYXJkd2FyZSBzdGF0dXMgcGFnZSBpbnRvIHNldHVwIGFuZCBpbml0aWFsaXNhdGlvbiwKd2hl cmUgc2V0dXAgbWVhbnMgc2V0dGluZyB1cCB0aGUgZHJpdmVyIHN0YXRlIHRvIHN1cHBvcnQgdGhl CmVuZ2luZSwgYW5kIGluaXRpYWxpemF0aW9uIG1lYW5zIHByb2dyYW1taW5nIHRoZSBoYXJkd2Fy ZQp3aXRoIHRoZSBiZWZvcmUgc2V0IHVwIHN0YXRlLgoKVGhpcyB3YXkgdGhlIGRlc2lnbiBtYXRj aGVzIHRoZSBkZXNpZ24gb2YgdGhlIGVuZ2luZSBzZXR1cC9pbml0CmNvZGUgd2hpY2ggaXMgc3Bs aXQgaW4gdGhlIHNhbWUgZmFzaGlvbiBhbmQgaXQgZW5hYmxlcyB0aGUKc3RhZ2VzIHRvIGJlIHVz ZWQgaW4gYSBiYWxhbmNlZCBmYXNoaW9uIChlbmdpbmUgc2V0dXAgLSBod3MKc2V0dXAsIGVuZ2lu ZSBpbml0IC0gaHdzIGluaXQpLgoKVGhpcyB3aWxsIGVuYWJsZSB0aGUgdXBjb21pbmcgaW1wcm92 ZW1lbnRzIHRvIHNsb3QgaW4gd2l0aG91dAphbnkga2x1ZGdlcyBvbiB0aGUgR1BVIHJlc2V0IHBh dGguCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwu Y29tPgpTdWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr PgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCA1MCArKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMjMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBlNmU2OWMyZjIzODYuLjNm ZDJhZTZjZThlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTIyOSw5ICsyMjksNiBA QCBlbnVtIHsKIAogc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3BpbihzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4LAogCQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Ci1zdGF0 aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lLAotCQkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVs dF9jdHhfb2JqKTsKLQogCiAvKioKICAqIGludGVsX3Nhbml0aXplX2VuYWJsZV9leGVjbGlzdHMo KSAtIHNhbml0aXplIGk5MTUuZW5hYmxlX2V4ZWNsaXN0cwpAQCAtMTU4MCwxNCArMTU3NywyMiBA QCBvdXQ6CiAJcmV0dXJuIHJldDsKIH0KIAorc3RhdGljIHZvaWQgbHJjX2luaXRfaHdzKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBlbmdpbmUtPmRldi0+ZGV2X3ByaXZhdGU7CisKKwlJOTE1X1dSSVRFKFJJTkdf SFdTX1BHQShlbmdpbmUtPm1taW9fYmFzZSksCisJCSAgICh1MzIpZW5naW5lLT5zdGF0dXNfcGFn ZS5nZnhfYWRkcik7CisJUE9TVElOR19SRUFEKFJJTkdfSFdTX1BHQShlbmdpbmUtPm1taW9fYmFz ZSkpOworfQorCiBzdGF0aWMgaW50IGdlbjhfaW5pdF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuZ2luZS0+ ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CiAJdW5zaWduZWQgaW50IG5leHRfY29udGV4dF9zdGF0dXNfYnVmZmVyX2h3OwogCi0JbHJj X3NldHVwX2hhcmR3YXJlX3N0YXR1c19wYWdlKGVuZ2luZSwKLQkJCQkgICAgICAgZGV2X3ByaXYt Pmtlcm5lbF9jb250ZXh0LT5lbmdpbmVbZW5naW5lLT5pZF0uc3RhdGUpOworCWxyY19pbml0X2h3 cyhlbmdpbmUpOwogCiAJSTkxNV9XUklURV9JTVIoZW5naW5lLAogCQkgICAgICAgfihlbmdpbmUt PmlycV9lbmFibGVfbWFzayB8IGVuZ2luZS0+aXJxX2tlZXBfbWFzaykpOwpAQCAtMjA4Nyw2ICsy MDkyLDIwIEBAIGxvZ2ljYWxfcmluZ19kZWZhdWx0X2lycXMoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lLCB1bnNpZ25lZCBzaGlmdCkKIAllbmdpbmUtPmlycV9rZWVwX21hc2sgPSBHVF9D T05URVhUX1NXSVRDSF9JTlRFUlJVUFQgPDwgc2hpZnQ7CiB9CiAKK3N0YXRpYyB2b2lkCitscmNf c2V0dXBfaHdzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkgICAgICBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqZGN0eF9vYmopCit7CisJc3RydWN0IHBhZ2UgKnBhZ2U7CisK KwkvKiBUaGUgSFdTUCBpcyBwYXJ0IG9mIHRoZSBkZWZhdWx0IGNvbnRleHQgb2JqZWN0IGluIExS QyBtb2RlLiAqLworCWVuZ2luZS0+c3RhdHVzX3BhZ2UuZ2Z4X2FkZHIgPSBpOTE1X2dlbV9vYmpf Z2d0dF9vZmZzZXQoZGN0eF9vYmopICsKKwkJCQkgICAgICAgTFJDX1BQSFdTUF9QTiAqIFBBR0Vf U0laRTsKKwlwYWdlID0gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGRjdHhfb2JqLCBMUkNfUFBI V1NQX1BOKTsKKwllbmdpbmUtPnN0YXR1c19wYWdlLnBhZ2VfYWRkciA9IGttYXAocGFnZSk7CisJ ZW5naW5lLT5zdGF0dXNfcGFnZS5vYmogPSBkY3R4X29iajsKK30KKwogc3RhdGljIGludAogbG9n aWNhbF9yaW5nX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lKQogewpAQCAtMjE0NSw2ICsyMTY0LDkgQEAgbG9naWNhbF9yaW5nX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQog CQlnb3RvIGVycm9yOwogCX0KIAorCS8qIEFuZCBzZXR1cCB0aGUgaGFyZHdhcmUgc3RhdHVzIHBh Z2UuICovCisJbHJjX3NldHVwX2h3cyhlbmdpbmUsIGRjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5z dGF0ZSk7CisKIAlyZXR1cm4gMDsKIAogZXJyb3I6CkBAIC0yNjA1LDI0ICsyNjI3LDYgQEAgdWlu dDMyX3QgaW50ZWxfbHJfY29udGV4dF9zaXplKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3Rh dHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAotCQkJCQkgICBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqZGVmYXVsdF9jdHhfb2JqKQotewotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+ZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3Qg cGFnZSAqcGFnZTsKLQotCS8qIFRoZSBIV1NQIGlzIHBhcnQgb2YgdGhlIGRlZmF1bHQgY29udGV4 dCBvYmplY3QgaW4gTFJDIG1vZGUuICovCi0JZW5naW5lLT5zdGF0dXNfcGFnZS5nZnhfYWRkciA9 IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChkZWZhdWx0X2N0eF9vYmopCi0JCQkrIExSQ19QUEhX U1BfUE4gKiBQQUdFX1NJWkU7Ci0JcGFnZSA9IGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShkZWZh dWx0X2N0eF9vYmosIExSQ19QUEhXU1BfUE4pOwotCWVuZ2luZS0+c3RhdHVzX3BhZ2UucGFnZV9h ZGRyID0ga21hcChwYWdlKTsKLQllbmdpbmUtPnN0YXR1c19wYWdlLm9iaiA9IGRlZmF1bHRfY3R4 X29iajsKLQotCUk5MTVfV1JJVEUoUklOR19IV1NfUEdBKGVuZ2luZS0+bW1pb19iYXNlKSwKLQkJ CSh1MzIpZW5naW5lLT5zdGF0dXNfcGFnZS5nZnhfYWRkcik7Ci0JUE9TVElOR19SRUFEKFJJTkdf SFdTX1BHQShlbmdpbmUtPm1taW9fYmFzZSkpOwotfQotCiAvKioKICAqIGludGVsX2xyX2NvbnRl eHRfZGVmZXJyZWRfYWxsb2MoKSAtIGNyZWF0ZSB0aGUgTFJDIHNwZWNpZmljIGJpdHMgb2YgYSBj b250ZXh0CiAgKiBAY3R4OiBMUiBjb250ZXh0IHRvIGNyZWF0ZS4KLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK