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: Tue, 17 Mar 2015 15:45:16 +0000 Message-ID: <1426607117-10626-7-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1426607117-10626-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 64D606E708 for ; Tue, 17 Mar 2015 08:45:29 -0700 (PDT) In-Reply-To: <1426607117-10626-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 Y2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAyMyArKysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggICAgIHwgIDkgKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9zcHJpdGUuYyAgfCAgNSArKysrLQogMyBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25z KCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCBjMmMzYTc2Li45YWY3M2IxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0yMjYzLDggKzIyNjMsNyBAQCBpbnQgaW50ZWxfZmlsbF9mYl9nZ3R0X3ZpZXcoc3RydWN0IGk5 MTVfZ2d0dF92aWV3ICp2aWV3LAogCWlmICghcGxhbmVfc3RhdGUpCiAJCXJldHVybiAwOwogCi0J aWYgKCEocGxhbmVfc3RhdGUtPnJvdGF0aW9uICYKLQkgICAgKEJJVChEUk1fUk9UQVRFXzkwKSB8 IEJJVChEUk1fUk9UQVRFXzI3MCkpKSkKKwlpZiAoIWludGVsX3JvdGF0aW9uXzkwX29yXzI3MChw bGFuZV9zdGF0ZS0+cm90YXRpb24pKQogCQlyZXR1cm4gMDsKIAogCSp2aWV3ID0gcm90YXRlZF92 aWV3OwpAQCAtMjg2Miw2ICsyODYxLDE3IEBAIHUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQ2NF90IGZiX21vZGlmaWVyLAogCX0KIH0KIAor dW5zaWduZWQgbG9uZyBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHN0cnVjdCBpbnRlbF9wbGFuZSAq aW50ZWxfcGxhbmUsCisJCQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQor eworCWVudW0gaTkxNV9nZ3R0X3ZpZXdfdHlwZSB2aWV3ID0gSTkxNV9HR1RUX1ZJRVdfTk9STUFM OworCisJaWYgKGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChpbnRlbF9wbGFuZS0+YmFzZS5zdGF0 ZS0+cm90YXRpb24pKQorCQl2aWV3ID0gSTkxNV9HR1RUX1ZJRVdfUk9UQVRFRDsKKworCXJldHVy biBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXRfdmlldyhvYmosIHZpZXcpOworfQorCiBzdGF0aWMg dm9pZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAkJCQkJIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCQkJCQkgaW50IHgsIGludCB5KQpA QCAtMjg3Miw2ICsyODgyLDcgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9w bGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iajsKIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJdTMyIHBsYW5lX2N0bCwgc3Ry aWRlX2RpdjsKKwl1bnNpZ25lZCBsb25nIHN1cmZfYWRkcjsKIAogCWlmICghaW50ZWxfY3J0Yy0+ cHJpbWFyeV9lbmFibGVkKSB7CiAJCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUsIDApLCAwKTsK QEAgLTI5MzgsMTYgKzI5NDksMTYgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFy eV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsK IAlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXYsIGZiLT5tb2RpZmll clswXSwKIAkJCQkJICAgICAgIGZiLT5waXhlbF9mb3JtYXQpOworCXN1cmZfYWRkciA9IGludGVs X3BsYW5lX29ial9vZmZzZXQodG9faW50ZWxfcGxhbmUoY3J0Yy0+cHJpbWFyeSksIG9iaik7CiAK IAlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCAwKSwgcGxhbmVfY3RsKTsKLQogCUk5MTVfV1JJ VEUoUExBTkVfUE9TKHBpcGUsIDApLCAwKTsKIAlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBl LCAwKSwgKHkgPDwgMTYpIHwgeCk7CiAJSTkxNV9XUklURShQTEFORV9TSVpFKHBpcGUsIDApLAog CQkgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oIC0gMSkgPDwgMTYgfAogCQkgICAo aW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193IC0gMSkpOwogCUk5MTVfV1JJVEUoUExBTkVf U1RSSURFKHBpcGUsIDApLCBmYi0+cGl0Y2hlc1swXSAvIHN0cmlkZV9kaXYpOwotCUk5MTVfV1JJ VEUoUExBTkVfU1VSRihwaXBlLCAwKSwgaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikpOwor CUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCAwKSwgc3VyZl9hZGRyKTsKIAogCVBPU1RJTkdf UkVBRChQTEFORV9TVVJGKHBpcGUsIDApKTsKIH0KQEAgLTEwMDM5LDggKzEwMDUwLDggQEAgc3Rh dGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYg KHJldCkKIAkJZ290byBjbGVhbnVwX3BlbmRpbmc7CiAKLQl3b3JrLT5ndHRfb2Zmc2V0ID0KLQkJ aTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgKyBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNl dDsKKwl3b3JrLT5ndHRfb2Zmc2V0ID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0b19pbnRlbF9w bGFuZShwcmltYXJ5KSwgb2JqKQorCQkJCQkJICArIGludGVsX2NydGMtPmRzcGFkZHJfb2Zmc2V0 OwogCiAJaWYgKHVzZV9tbWlvX2ZsaXAocmluZywgb2JqKSkgewogCQlyZXQgPSBpbnRlbF9xdWV1 ZV9tbWlvX2ZsaXAoZGV2LCBjcnRjLCBmYiwgb2JqLCByaW5nLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAppbmRleCA1M2ExMzcyLi5hZTI4ZmI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApA QCAtOTkxLDYgKzk5MSwxMiBAQCB1bnNpZ25lZCBpbnQKIGludGVsX3RpbGVfaGVpZ2h0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCwKIAkJICB1aW50NjRfdCBm Yl9mb3JtYXRfbW9kaWZpZXIpOwogCitzdGF0aWMgaW5saW5lIGJvb2wKK2ludGVsX3JvdGF0aW9u XzkwX29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCit7CisJcmV0dXJuIHJvdGF0aW9uICYg KEJJVChEUk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpOworfQorCiAvKiBzaGFy ZWQgZHBsbCBmdW5jdGlvbnMgKi8KIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqaW50ZWxfY3J0 Y190b19zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CiB2b2lkIGFzc2VydF9z aGFyZWRfZHBsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0xMDQ1LDYg KzEwNTEsOSBAQCB2b2lkIGludGVsX21vZGVfZnJvbV9waXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2Rp c3BsYXlfbW9kZSAqbW9kZSwKIHZvaWQgaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBz KHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX21vZGVzZXRfcHJlY2xvc2Uoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKTsKIAordW5zaWduZWQg bG9uZyBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxh bmUsCisJCQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKKwogLyogaW50 ZWxfZHAuYyAqLwogdm9pZCBpbnRlbF9kcF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGlu dCBvdXRwdXRfcmVnLCBlbnVtIHBvcnQgcG9ydCk7CiBib29sIGludGVsX2RwX2luaXRfY29ubmVj dG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBhODI4NzM2Li5kOTYwNTcyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTkxLDYgKzE5MSw3IEBAIHNrbF91cGRhdGVfcGxhbmUo c3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJY29u c3QgaW50IHBsYW5lID0gaW50ZWxfcGxhbmUtPnBsYW5lICsgMTsKIAl1MzIgcGxhbmVfY3RsLCBz dHJpZGVfZGl2OwogCWludCBwaXhlbF9zaXplID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBp eGVsX2Zvcm1hdCwgMCk7CisJdW5zaWduZWQgbG9uZyBzdXJmX2FkZHI7CiAKIAlwbGFuZV9jdGwg PSBJOTE1X1JFQUQoUExBTkVfQ1RMKHBpcGUsIHBsYW5lKSk7CiAKQEAgLTI4MCwxMiArMjgxLDE0 IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJY3J0Y193LS07CiAJY3J0Y19oLS07CiAKKwlzdXJmX2FkZHIgPSBp bnRlbF9wbGFuZV9vYmpfb2Zmc2V0KGludGVsX3BsYW5lLCBvYmopOworCiAJSTkxNV9XUklURShQ TEFORV9PRkZTRVQocGlwZSwgcGxhbmUpLCAoeSA8PCAxNikgfCB4KTsKIAlJOTE1X1dSSVRFKFBM QU5FX1NUUklERShwaXBlLCBwbGFuZSksIGZiLT5waXRjaGVzWzBdIC8gc3RyaWRlX2Rpdik7CiAJ STkxNV9XUklURShQTEFORV9QT1MocGlwZSwgcGxhbmUpLCAoY3J0Y195IDw8IDE2KSB8IGNydGNf eCk7CiAJSTkxNV9XUklURShQTEFORV9TSVpFKHBpcGUsIHBsYW5lKSwgKGNydGNfaCA8PCAxNikg fCBjcnRjX3cpOwogCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUsIHBsYW5lKSwgcGxhbmVfY3Rs KTsKLQlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgcGxhbmUpLCBpOTE1X2dlbV9vYmpfZ2d0 dF9vZmZzZXQob2JqKSk7CisJSTkxNV9XUklURShQTEFORV9TVVJGKHBpcGUsIHBsYW5lKSwgc3Vy Zl9hZGRyKTsKIAlQT1NUSU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCBwbGFuZSkpOwogfQogCi0t IAoyLjMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK