From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 6/7] drm/i915/skl: Query display address through a wrapper Date: Mon, 23 Mar 2015 11:10:37 +0000 Message-ID: <1427109038-19597-7-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1427109038-19597-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A989772029 for ; Mon, 23 Mar 2015 04:10:56 -0700 (PDT) In-Reply-To: <1427109038-19597-1-git-send-email-tvrtko.ursulin@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk5lZWQgdG8g ZG8gdGhpcyBpbiBvcmRlciB0byBzdXBwb3J0IDkwLzI3MCByb3RhdGVkIGRpc3BsYXkuCgp2Mjog UGFzcyBpbiBkcm1fcGxhbmUgaW5zdGVhZCBvZiBwbGFuZSBpbmRleCB0byBpbnRlbF9vYmpfZGlz cGxheV9hZGRyZXNzLgoKdjM6CiAgICAqIFJlbmFtZWQgaW50ZWxfb2JqX2Rpc3BsYXlfYWRkcmVz cyB0byBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0LgogICAgICAoQ2hyaXMgV2lsc29uKQogICAgKiBT aW1wbGlmaWVkIHJvdGF0aW9uIGNoZWNrIHRvIGJpdHdpc2UgQU5ELiAoQ2hyaXMgV2lsc29uKQoK djQ6CiAgICAqIEV4dHJhY3RlZCA5MC8yNzAgcm90YXRpb24gY2hlY2sgaW50byBhIGhlbHBlciBm dW5jdGlvbi4gKE1pY2hlbCBUaGllcnJ5KQoKdjU6CiAgICAqIFJlYmFzZWQgZm9yIGdndHQgdmll dyBjaGFuZ2VzLgoKRm9yOiBWSVotNDU0NQpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWljaGVsIFRoaWVycnkgPG1p Y2hlbC50aGllcnJ5QGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEpvb25hcyBMYWh0aW5lbiA8am9v bmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgfCAyMyArKysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDkgKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAgNSArKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNl cnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwppbmRleCBmNjA1YjA5Li5kMWY5MDk5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0yMzAxLDggKzIzMDEsNyBAQCBpbnRlbF9maWxsX2ZiX2dndHRfdmlldyhzdHJ1Y3Qg aTkxNV9nZ3R0X3ZpZXcgKnZpZXcsIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCWlmICgh cGxhbmVfc3RhdGUpCiAJCXJldHVybiAwOwogCi0JaWYgKCEocGxhbmVfc3RhdGUtPnJvdGF0aW9u ICYKLQkgICAgKEJJVChEUk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpKSkKKwlp ZiAoIWludGVsX3JvdGF0aW9uXzkwX29yXzI3MChwbGFuZV9zdGF0ZS0+cm90YXRpb24pKQogCQly ZXR1cm4gMDsKIAogCSp2aWV3ID0gcm90YXRlZF92aWV3OwpAQCAtMjkwMCw2ICsyODk5LDE3IEBA IHUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVp bnQ2NF90IGZiX21vZGlmaWVyLAogCX0KIH0KIAordW5zaWduZWQgbG9uZyBpbnRlbF9wbGFuZV9v Ympfb2Zmc2V0KHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUsCisJCQkJICAgICBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQoreworCWVudW0gaTkxNV9nZ3R0X3ZpZXdfdHlw ZSB2aWV3ID0gSTkxNV9HR1RUX1ZJRVdfTk9STUFMOworCisJaWYgKGludGVsX3JvdGF0aW9uXzkw X29yXzI3MChpbnRlbF9wbGFuZS0+YmFzZS5zdGF0ZS0+cm90YXRpb24pKQorCQl2aWV3ID0gSTkx NV9HR1RUX1ZJRVdfUk9UQVRFRDsKKworCXJldHVybiBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXRf dmlldyhvYmosIHZpZXcpOworfQorCiBzdGF0aWMgdm9pZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5 X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkJIHN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiLAogCQkJCQkgaW50IHgsIGludCB5KQpAQCAtMjkxMCw2ICsyOTIwLDcgQEAgc3RhdGlj IHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAlpbnQgcGlwZSA9IGludGVsX2Ny dGMtPnBpcGU7CiAJdTMyIHBsYW5lX2N0bCwgc3RyaWRlX2RpdjsKKwl1bnNpZ25lZCBsb25nIHN1 cmZfYWRkcjsKIAogCWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKSB7CiAJCUk5MTVf V1JJVEUoUExBTkVfQ1RMKHBpcGUsIDApLCAwKTsKQEAgLTI5NzYsMTYgKzI5ODcsMTYgQEAgc3Rh dGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3Ry aWRlX2FsaWdubWVudChkZXYsIGZiLT5tb2RpZmllclswXSwKIAkJCQkJICAgICAgIGZiLT5waXhl bF9mb3JtYXQpOworCXN1cmZfYWRkciA9IGludGVsX3BsYW5lX29ial9vZmZzZXQodG9faW50ZWxf cGxhbmUoY3J0Yy0+cHJpbWFyeSksIG9iaik7CiAKIAlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBl LCAwKSwgcGxhbmVfY3RsKTsKLQogCUk5MTVfV1JJVEUoUExBTkVfUE9TKHBpcGUsIDApLCAwKTsK IAlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBlLCAwKSwgKHkgPDwgMTYpIHwgeCk7CiAJSTkx NV9XUklURShQTEFORV9TSVpFKHBpcGUsIDApLAogCQkgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5w aXBlX3NyY19oIC0gMSkgPDwgMTYgfAogCQkgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3Ny Y193IC0gMSkpOwogCUk5MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIDApLCBmYi0+cGl0Y2hl c1swXSAvIHN0cmlkZV9kaXYpOwotCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCAwKSwgaTkx NV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikpOworCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBl LCAwKSwgc3VyZl9hZGRyKTsKIAogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUsIDApKTsK IH0KQEAgLTEwMDc5LDggKzEwMDkwLDggQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxp cChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKHJldCkKIAkJZ290byBjbGVhbnVwX3BlbmRp bmc7CiAKLQl3b3JrLT5ndHRfb2Zmc2V0ID0KLQkJaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9i aikgKyBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldDsKKwl3b3JrLT5ndHRfb2Zmc2V0ID0gaW50 ZWxfcGxhbmVfb2JqX29mZnNldCh0b19pbnRlbF9wbGFuZShwcmltYXJ5KSwgb2JqKQorCQkJCQkJ ICArIGludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0OwogCiAJaWYgKHVzZV9tbWlvX2ZsaXAocmlu Zywgb2JqKSkgewogCQlyZXQgPSBpbnRlbF9xdWV1ZV9tbWlvX2ZsaXAoZGV2LCBjcnRjLCBmYiwg b2JqLCByaW5nLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBjYjAwYmQwLi5kYjBlN2Jm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtOTg4LDYgKzk4OCwxMiBAQCB1bnNpZ25l ZCBpbnQKIGludGVsX3RpbGVfaGVpZ2h0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQzMl90 IHBpeGVsX2Zvcm1hdCwKIAkJICB1aW50NjRfdCBmYl9mb3JtYXRfbW9kaWZpZXIpOwogCitzdGF0 aWMgaW5saW5lIGJvb2wKK2ludGVsX3JvdGF0aW9uXzkwX29yXzI3MCh1bnNpZ25lZCBpbnQgcm90 YXRpb24pCit7CisJcmV0dXJuIHJvdGF0aW9uICYgKEJJVChEUk1fUk9UQVRFXzkwKSB8IEJJVChE Uk1fUk9UQVRFXzI3MCkpOworfQorCiAvKiBzaGFyZWQgZHBsbCBmdW5jdGlvbnMgKi8KIHN0cnVj dCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0Yyk7CiB2b2lkIGFzc2VydF9zaGFyZWRfZHBsbChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0xMDQyLDYgKzEwNDgsOSBAQCB2b2lkIGludGVsX21vZGVf ZnJvbV9waXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKIHZvaWQgaW50 ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiB2 b2lkIGludGVsX21vZGVzZXRfcHJlY2xvc2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGRybV9maWxlICpmaWxlKTsKIAordW5zaWduZWQgbG9uZyBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0 KHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUsCisJCQkJICAgICBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqKTsKKwogLyogaW50ZWxfZHAuYyAqLwogdm9pZCBpbnRlbF9kcF9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBvdXRwdXRfcmVnLCBlbnVtIHBvcnQgcG9y dCk7CiBib29sIGludGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3Bv cnQgKmludGVsX2RpZ19wb3J0LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAw ZjAwMjA5Li4wMDVhNmZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTkz LDYgKzE5Myw3IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5l LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJdTMyIHBsYW5lX2N0bCwgc3RyaWRlX2RpdjsKIAlp bnQgcGl4ZWxfc2l6ZSA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIDAp OwogCWNvbnN0IHN0cnVjdCBkcm1faW50ZWxfc3ByaXRlX2NvbG9ya2V5ICprZXkgPSAmaW50ZWxf cGxhbmUtPmNrZXk7CisJdW5zaWduZWQgbG9uZyBzdXJmX2FkZHI7CiAKIAlwbGFuZV9jdGwgPSBQ TEFORV9DVExfRU5BQkxFIHwKIAkJUExBTkVfQ1RMX1BJUEVfQ1NDX0VOQUJMRTsKQEAgLTI4MCwx MiArMjgxLDE0IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5l LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJZWxzZSBpZiAoa2V5LT5mbGFncyAmIEk5MTVfU0VU X0NPTE9SS0VZX1NPVVJDRSkKIAkJcGxhbmVfY3RsIHw9IFBMQU5FX0NUTF9LRVlfRU5BQkxFX1NP VVJDRTsKIAorCXN1cmZfYWRkciA9IGludGVsX3BsYW5lX29ial9vZmZzZXQoaW50ZWxfcGxhbmUs IG9iaik7CisKIAlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBlLCBwbGFuZSksICh5IDw8IDE2 KSB8IHgpOwogCUk5MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIHBsYW5lKSwgZmItPnBpdGNo ZXNbMF0gLyBzdHJpZGVfZGl2KTsKIAlJOTE1X1dSSVRFKFBMQU5FX1BPUyhwaXBlLCBwbGFuZSks IChjcnRjX3kgPDwgMTYpIHwgY3J0Y194KTsKIAlJOTE1X1dSSVRFKFBMQU5FX1NJWkUocGlwZSwg cGxhbmUpLCAoY3J0Y19oIDw8IDE2KSB8IGNydGNfdyk7CiAJSTkxNV9XUklURShQTEFORV9DVEwo cGlwZSwgcGxhbmUpLCBwbGFuZV9jdGwpOwotCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCBw bGFuZSksIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopKTsKKwlJOTE1X1dSSVRFKFBMQU5F X1NVUkYocGlwZSwgcGxhbmUpLCBzdXJmX2FkZHIpOwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJG KHBpcGUsIHBsYW5lKSk7CiB9CiAKLS0gCjIuMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=