From: Tvrtko Ursulin Subject: [PATCH 4/5] drm/i915/skl: Query display address through a wrapper Date: Mon, 2 Mar 2015 14:43:51 +0000 Message-ID: <1425307432-4955-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1425307432-4955-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 A57346E477 for ; Mon, 2 Mar 2015 06:44:07 -0800 (PST) In-Reply-To: <1425307432-4955-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 L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGNiNGRhZTguLjE1YzI4YjEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIzNjMsOCArMjM2Myw3IEBAIGludCBpbnRlbF9m Yl9nZ3R0X3ZpZXcoc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCiAJaWYgKCFw bGFuZV9zdGF0ZSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAocGxhbmVfc3RhdGUtPnJvdGF0aW9uICYK LQkgICAgKEJJVChEUk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpKSA9PSAwKQor CWlmICghaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHBsYW5lX3N0YXRlLT5yb3RhdGlvbikpCiAJ CXJldHVybiAwOwogCiAJbWVtY3B5KHZpZXcsICZpOTE1X3JvdGF0ZWRfZ2d0dF92aWV3X3RlbXBs YXRlLCBzaXplb2YoKnZpZXcpKTsKQEAgLTI5ODAsNiArMjk3OSwxNyBAQCB1MzIgaW50ZWxfZmJf c3RyaWRlX2FsaWdubWVudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50NjRfdCBmYl9tb2Rp ZmllciwKIAl9CiB9CiAKK3Vuc2lnbmVkIGxvbmcgaW50ZWxfcGxhbmVfb2JqX29mZnNldChzdHJ1 Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lLAorCQkJCSAgICAgc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaikKK3sKKwllbnVtIGk5MTVfZ2d0dF92aWV3X3R5cGUgdmlldyA9IEk5MTVf R0dUVF9WSUVXX05PUk1BTDsKKworCWlmIChpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAoaW50ZWxf cGxhbmUtPmJhc2Uuc3RhdGUtPnJvdGF0aW9uKSkKKwkJdmlldyA9IEk5MTVfR0dUVF9WSUVXX1JP VEFURUQ7CisKKwlyZXR1cm4gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0X3ZpZXcob2JqLCB2aWV3 KTsKK30KKwogc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJCQkJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAkJCQkJ IGludCB4LCBpbnQgeSkKQEAgLTI5OTAsNiArMzAwMCw3IEBAIHN0YXRpYyB2b2lkIHNreWxha2Vf dXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXUz MiBwbGFuZV9jdGwsIHN0cmlkZV9kaXY7CisJdW5zaWduZWQgbG9uZyBzdXJmX2FkZHI7CiAKIAlp ZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkgewogCQlJOTE1X1dSSVRFKFBMQU5FX0NU TChwaXBlLCAwKSwgMCk7CkBAIC0zMDU2LDExICszMDY3LDEyIEBAIHN0YXRpYyB2b2lkIHNreWxh a2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCW9iaiA9IGlu dGVsX2ZiX29iaihmYik7CiAJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQo ZGV2LCBmYi0+bW9kaWZpZXJbMF0sCiAJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsKKwlz dXJmX2FkZHIgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHRvX2ludGVsX3BsYW5lKGNydGMtPnBy aW1hcnkpLCBvYmopOwogCiAJSTkxNV9XUklURShQTEFORV9DVEwocGlwZSwgMCksIHBsYW5lX2N0 bCk7CiAKIAlEUk1fREVCVUdfS01TKCJXcml0aW5nIGJhc2UgJTA4bFggJWQsJWQsJWQsJWQgcGl0 Y2g9JWRcbiIsCi0JCSAgICAgIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopLAorCQkgICAg ICBzdXJmX2FkZHIsCiAJCSAgICAgIHgsIHksIGZiLT53aWR0aCwgZmItPmhlaWdodCwKIAkJICAg ICAgZmItPnBpdGNoZXNbMF0pOwogCkBAIC0zMDcwLDcgKzMwODIsNyBAQCBzdGF0aWMgdm9pZCBz a3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJICAg KGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCAtIDEpIDw8IDE2IHwKIAkJICAgKGludGVs X2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdyAtIDEpKTsKIAlJOTE1X1dSSVRFKFBMQU5FX1NUUklE RShwaXBlLCAwKSwgZmItPnBpdGNoZXNbMF0gLyBzdHJpZGVfZGl2KTsKLQlJOTE1X1dSSVRFKFBM QU5FX1NVUkYocGlwZSwgMCksIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopKTsKKwlJOTE1 X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgMCksIHN1cmZfYWRkcik7CiAKIAlQT1NUSU5HX1JFQUQo UExBTkVfU1VSRihwaXBlLCAwKSk7CiB9CkBAIC0xMDEwMiw4ICsxMDExNCw4IEBAIHN0YXRpYyBp bnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChyZXQp CiAJCWdvdG8gY2xlYW51cF9wZW5kaW5nOwogCi0Jd29yay0+Z3R0X29mZnNldCA9Ci0JCWk5MTVf Z2VtX29ial9nZ3R0X29mZnNldChvYmopICsgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZzZXQ7CisJ d29yay0+Z3R0X29mZnNldCA9IGludGVsX3BsYW5lX29ial9vZmZzZXQodG9faW50ZWxfcGxhbmUo cHJpbWFyeSksIG9iaikKKwkJCQkJCSAgKyBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldDsKIAog CWlmICh1c2VfbW1pb19mbGlwKHJpbmcsIG9iaikpIHsKIAkJcmV0ID0gaW50ZWxfcXVldWVfbW1p b19mbGlwKGRldiwgY3J0YywgZmIsIG9iaiwgcmluZywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK aW5kZXggOWMyMTQ1ZC4uNTY5MGFhNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk4 MCw2ICs5ODAsMTEgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19zZXRfcHJvcGVydHkoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkJICAgIHN0cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5 LAogCQkJCSAgICB1aW50NjRfdCB2YWwpOwogCitzdGF0aWMgaW5saW5lIGJvb2wKK2ludGVsX3Jv dGF0aW9uXzkwX29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCit7CisJcmV0dXJuIHJvdGF0 aW9uICYgKEJJVChEUk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpOworfQogc3Ry dWN0IHNnX3RhYmxlICppbnRlbF9yb3RhdGVfZmJfb2JqX3BhZ2VzKHN0cnVjdCBpOTE1X2dndHRf dmlldyAqZ2d0dF92aWV3LAogCQkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq KTsKIApAQCAtMTAzNyw2ICsxMDQyLDkgQEAgdm9pZCBpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25m aWcoc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUsCiB2b2lkIGludGVsX2NydGNfd2FpdF9m b3JfcGVuZGluZ19mbGlwcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9tb2Rl c2V0X3ByZWNsb3NlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmls ZSk7CiAKK3Vuc2lnbmVkIGxvbmcgaW50ZWxfcGxhbmVfb2JqX29mZnNldChzdHJ1Y3QgaW50ZWxf cGxhbmUgKmludGVsX3BsYW5lLAorCQkJCSAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaik7CisKIC8qIGludGVsX2RwLmMgKi8KIHZvaWQgaW50ZWxfZHBfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgb3V0cHV0X3JlZywgZW51bSBwb3J0IHBvcnQpOwogYm9vbCBpbnRl bF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdf cG9ydCwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNzA1MWRhNy4uY2FhMGJj YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE5MSw2ICsxOTEsNyBAQCBz a2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9j cnRjICpjcnRjLAogCWNvbnN0IGludCBwbGFuZSA9IGludGVsX3BsYW5lLT5wbGFuZSArIDE7CiAJ dTMyIHBsYW5lX2N0bCwgc3RyaWRlX2RpdjsKIAlpbnQgcGl4ZWxfc2l6ZSA9IGRybV9mb3JtYXRf cGxhbmVfY3BwKGZiLT5waXhlbF9mb3JtYXQsIDApOworCXVuc2lnbmVkIGxvbmcgc3VyZl9hZGRy OwogCiAJcGxhbmVfY3RsID0gSTkxNV9SRUFEKFBMQU5FX0NUTChwaXBlLCBwbGFuZSkpOwogCkBA IC0yODAsMTIgKzI4MSwxNCBAQCBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRy bV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWNydGNfdy0tOwogCWNydGNfaC0tOwog CisJc3VyZl9hZGRyID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldChpbnRlbF9wbGFuZSwgb2JqKTsK KwogCUk5MTVfV1JJVEUoUExBTkVfT0ZGU0VUKHBpcGUsIHBsYW5lKSwgKHkgPDwgMTYpIHwgeCk7 CiAJSTkxNV9XUklURShQTEFORV9TVFJJREUocGlwZSwgcGxhbmUpLCBmYi0+cGl0Y2hlc1swXSAv IHN0cmlkZV9kaXYpOwogCUk5MTVfV1JJVEUoUExBTkVfUE9TKHBpcGUsIHBsYW5lKSwgKGNydGNf eSA8PCAxNikgfCBjcnRjX3gpOwogCUk5MTVfV1JJVEUoUExBTkVfU0laRShwaXBlLCBwbGFuZSks IChjcnRjX2ggPDwgMTYpIHwgY3J0Y193KTsKIAlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCBw bGFuZSksIHBsYW5lX2N0bCk7Ci0JSTkxNV9XUklURShQTEFORV9TVVJGKHBpcGUsIHBsYW5lKSwg aTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikpOworCUk5MTVfV1JJVEUoUExBTkVfU1VSRihw aXBlLCBwbGFuZSksIHN1cmZfYWRkcik7CiAJUE9TVElOR19SRUFEKFBMQU5FX1NVUkYocGlwZSwg cGxhbmUpKTsKIH0KIAotLSAKMi4zLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==