From: Tvrtko Ursulin Subject: [PATCH 7/8] drm/i915/skl: Query display address through a wrapper Date: Tue, 3 Mar 2015 14:22:37 +0000 Message-ID: <1425392558-15601-8-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1425392558-15601-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 96B706E5F9 for ; Tue, 3 Mar 2015 06:22:50 -0800 (PST) In-Reply-To: <1425392558-15601-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 dW5jdGlvbi4gKE1pY2hlbCBUaGllcnJ5KQoKRm9yOiBWSVotNDU0NQpTaWduZWQtb2ZmLWJ5OiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWlj aGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgNyArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAyNCArKysrKysrKysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oICAgICB8ICA4ICsrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zcHJpdGUuYyAgfCAgNSArKysrLQogNSBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25z KCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDc5ZDNmMmMu Ljk4YTRhYzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjg2MSw2ICsyODYxLDEzIEBA IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq KQogfQogCiBzdGF0aWMgaW5saW5lIHVuc2lnbmVkIGxvbmcKK2k5MTVfZ2VtX29ial9nZ3R0X29m ZnNldF92aWV3KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkgICAgICBlbnVt IGk5MTVfZ2d0dF92aWV3X3R5cGUgdmlldykKK3sKKwlyZXR1cm4gaTkxNV9nZW1fb2JqX29mZnNl dF92aWV3KG9iaiwgaTkxNV9vYmpfdG9fZ2d0dChvYmopLCB2aWV3KTsKK30KKworc3RhdGljIGlu bGluZSB1bnNpZ25lZCBsb25nCiBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmopCiB7CiAJcmV0dXJuIGk5MTVfZ2VtX29ial9zaXplKG9iaiwgaTkx NV9vYmpfdG9fZ2d0dChvYmopKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDA0YzBjYjEu LmY3NTJjN2Y1YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC01MTY4LDggKzUxNjgsOCBA QCB1bnNpZ25lZCBsb25nIGk5MTVfZ2VtX29ial9vZmZzZXRfdmlldyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqbywKIAkJCXJldHVybiB2bWEtPm5vZGUuc3RhcnQ7CiAKIAl9Ci0JV0FSTigx LCAiJXMgdm1hIGZvciB0aGlzIG9iamVjdCBub3QgZm91bmQuXG4iLAotCSAgICAgaTkxNV9pc19n Z3R0KHZtKSA/ICJnbG9iYWwiIDogInBwZ3R0Iik7CisJV0FSTigxLCAiJXMgdm1hIGZvciB0aGlz IG9iamVjdCBub3QgZm91bmQuICh2aWV3PSV1KVxuIiwKKwkgICAgIGk5MTVfaXNfZ2d0dCh2bSkg PyAiZ2xvYmFsIiA6ICJwcGd0dCIsIHZpZXcpOwogCXJldHVybiAtMTsKIH0KIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDQxNzRkNTIuLjZjYjg3OGIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIzNjAsOCArMjM2MCw3IEBAIGludCBpbnRlbF9m aWxsX2ZiX2dndHRfdmlldyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcsCiAJaWYgKCFwbGFu ZV9zdGF0ZSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAoIShwbGFuZV9zdGF0ZS0+cm90YXRpb24gJgot CSAgICAoQklUKERSTV9ST1RBVEVfOTApIHwgQklUKERSTV9ST1RBVEVfMjcwKSkpKQorCWlmICgh aW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHBsYW5lX3N0YXRlLT5yb3RhdGlvbikpCiAJCXJldHVy biAwOwogCiAJKnZpZXcgPSByb3RhdGVkX3ZpZXc7CkBAIC0yOTY2LDYgKzI5NjUsMTcgQEAgdTMy IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDY0 X3QgZmJfbW9kaWZpZXIsCiAJfQogfQogCit1bnNpZ25lZCBsb25nIGludGVsX3BsYW5lX29ial9v ZmZzZXQoc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSwKKwkJCQkgICAgIHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCit7CisJZW51bSBpOTE1X2dndHRfdmlld190eXBlIHZp ZXcgPSBJOTE1X0dHVFRfVklFV19OT1JNQUw7CisKKwlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3Jf MjcwKGludGVsX3BsYW5lLT5iYXNlLnN0YXRlLT5yb3RhdGlvbikpCisJCXZpZXcgPSBJOTE1X0dH VFRfVklFV19ST1RBVEVEOworCisJcmV0dXJuIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldF92aWV3 KG9iaiwgdmlldyk7Cit9CisKIHN0YXRpYyB2b2lkIHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxh bmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIsCiAJCQkJCSBpbnQgeCwgaW50IHkpCkBAIC0yOTc2LDYgKzI5ODYsNyBAQCBzdGF0aWMgdm9p ZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+ cGlwZTsKIAl1MzIgcGxhbmVfY3RsLCBzdHJpZGVfZGl2OworCXVuc2lnbmVkIGxvbmcgc3VyZl9h ZGRyOwogCiAJaWYgKCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQpIHsKIAkJSTkxNV9XUklU RShQTEFORV9DVEwocGlwZSwgMCksIDApOwpAQCAtMzA0MiwxMSArMzA1MywxMiBAQCBzdGF0aWMg dm9pZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAlvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXN0cmlkZV9kaXYgPSBpbnRlbF9mYl9zdHJpZGVf YWxpZ25tZW50KGRldiwgZmItPm1vZGlmaWVyWzBdLAogCQkJCQkgICAgICAgZmItPnBpeGVsX2Zv cm1hdCk7CisJc3VyZl9hZGRyID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0b19pbnRlbF9wbGFu ZShjcnRjLT5wcmltYXJ5KSwgb2JqKTsKIAogCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUsIDAp LCBwbGFuZV9jdGwpOwogCiAJRFJNX0RFQlVHX0tNUygiV3JpdGluZyBiYXNlICUwOGxYICVkLCVk LCVkLCVkIHBpdGNoPSVkXG4iLAotCQkgICAgICBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2Jq KSwKKwkJICAgICAgc3VyZl9hZGRyLAogCQkgICAgICB4LCB5LCBmYi0+d2lkdGgsIGZiLT5oZWln aHQsCiAJCSAgICAgIGZiLT5waXRjaGVzWzBdKTsKIApAQCAtMzA1Niw3ICszMDY4LDcgQEAgc3Rh dGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCiAJCSAgIChpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2ggLSAxKSA8PCAxNiB8CiAJ CSAgIChpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3cgLSAxKSk7CiAJSTkxNV9XUklURShQ TEFORV9TVFJJREUocGlwZSwgMCksIGZiLT5waXRjaGVzWzBdIC8gc3RyaWRlX2Rpdik7Ci0JSTkx NV9XUklURShQTEFORV9TVVJGKHBpcGUsIDApLCBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2Jq KSk7CisJSTkxNV9XUklURShQTEFORV9TVVJGKHBpcGUsIDApLCBzdXJmX2FkZHIpOwogCiAJUE9T VElOR19SRUFEKFBMQU5FX1NVUkYocGlwZSwgMCkpOwogfQpAQCAtMTAwODgsOCArMTAxMDAsOCBA QCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAlpZiAocmV0KQogCQlnb3RvIGNsZWFudXBfcGVuZGluZzsKIAotCXdvcmstPmd0dF9vZmZzZXQg PQotCQlpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArIGludGVsX2NydGMtPmRzcGFkZHJf b2Zmc2V0OworCXdvcmstPmd0dF9vZmZzZXQgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHRvX2lu dGVsX3BsYW5lKHByaW1hcnkpLCBvYmopCisJCQkJCQkgICsgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9v ZmZzZXQ7CiAKIAlpZiAodXNlX21taW9fZmxpcChyaW5nLCBvYmopKSB7CiAJCXJldCA9IGludGVs X3F1ZXVlX21taW9fZmxpcChkZXYsIGNydGMsIGZiLCBvYmosIHJpbmcsCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCmluZGV4IDc0NGNmMWEuLjlmYWJlMzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCkBAIC05ODEsNiArOTgxLDExIEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfc2V0X3Byb3Bl cnR5KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCSAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5 ICpwcm9wZXJ0eSwKIAkJCQkgICAgdWludDY0X3QgdmFsKTsKIAorc3RhdGljIGlubGluZSBib29s CitpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAodW5zaWduZWQgaW50IHJvdGF0aW9uKQoreworCXJl dHVybiByb3RhdGlvbiAmIChCSVQoRFJNX1JPVEFURV85MCkgfCBCSVQoRFJNX1JPVEFURV8yNzAp KTsKK30KIHN0cnVjdCBzZ190YWJsZSAqaW50ZWxfcm90YXRlX2ZiX29ial9wYWdlcyhzdHJ1Y3Qg aTkxNV9nZ3R0X3ZpZXcgKmdndHRfdmlldywKIAkJCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaik7CiAKQEAgLTEwMzgsNiArMTA0Myw5IEBAIHZvaWQgaW50ZWxfbW9kZV9mcm9t X3BpcGVfY29uZmlnKHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAogdm9pZCBpbnRlbF9j cnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQg aW50ZWxfbW9kZXNldF9wcmVjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUpOwogCit1bnNpZ25lZCBsb25nIGludGVsX3BsYW5lX29ial9vZmZzZXQoc3Ry dWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSwKKwkJCQkgICAgIHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmopOworCiAvKiBpbnRlbF9kcC5jICovCiB2b2lkIGludGVsX2RwX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KTsK IGJvb2wgaW50ZWxfZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAq aW50ZWxfZGlnX3BvcnQsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDcwNTFk YTcuLmNhYTBiY2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xOTEsNiAr MTkxLDcgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKIAljb25zdCBpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxh bmUgKyAxOwogCXUzMiBwbGFuZV9jdGwsIHN0cmlkZV9kaXY7CiAJaW50IHBpeGVsX3NpemUgPSBk cm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsKKwl1bnNpZ25lZCBsb25n IHN1cmZfYWRkcjsKIAogCXBsYW5lX2N0bCA9IEk5MTVfUkVBRChQTEFORV9DVEwocGlwZSwgcGxh bmUpKTsKIApAQCAtMjgwLDEyICsyODEsMTQgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAljcnRjX3ctLTsKIAlj cnRjX2gtLTsKIAorCXN1cmZfYWRkciA9IGludGVsX3BsYW5lX29ial9vZmZzZXQoaW50ZWxfcGxh bmUsIG9iaik7CisKIAlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBlLCBwbGFuZSksICh5IDw8 IDE2KSB8IHgpOwogCUk5MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIHBsYW5lKSwgZmItPnBp dGNoZXNbMF0gLyBzdHJpZGVfZGl2KTsKIAlJOTE1X1dSSVRFKFBMQU5FX1BPUyhwaXBlLCBwbGFu ZSksIChjcnRjX3kgPDwgMTYpIHwgY3J0Y194KTsKIAlJOTE1X1dSSVRFKFBMQU5FX1NJWkUocGlw ZSwgcGxhbmUpLCAoY3J0Y19oIDw8IDE2KSB8IGNydGNfdyk7CiAJSTkxNV9XUklURShQTEFORV9D VEwocGlwZSwgcGxhbmUpLCBwbGFuZV9jdGwpOwotCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBl LCBwbGFuZSksIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopKTsKKwlJOTE1X1dSSVRFKFBM QU5FX1NVUkYocGlwZSwgcGxhbmUpLCBzdXJmX2FkZHIpOwogCVBPU1RJTkdfUkVBRChQTEFORV9T VVJGKHBpcGUsIHBsYW5lKSk7CiB9CiAKLS0gCjIuMy4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=