From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 6/7] drm/i915/skl: Query display address through
	a wrapper
Date: Thu,  5 Mar 2015 14:07:35 +0000
Message-ID: <1425564456-3660-7-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1425564456-3660-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 89D086E7D4
 for <Intel-gfx@lists.freedesktop.org>; Thu,  5 Mar 2015 06:08:04 -0800 (PST)
In-Reply-To: <1425564456-3660-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
OTE1L2ludGVsX2Rydi5oICAgICB8ICA5ICsrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfc3ByaXRlLmMgIHwgIDUgKysrKy0KIDUgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9u
cygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBiMDRiMDdk
Li5lMTJiNmYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI4NzksNiArMjg3OSwxMyBA
QCBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i
aikKIH0KIAogc3RhdGljIGlubGluZSB1bnNpZ25lZCBsb25nCitpOTE1X2dlbV9vYmpfZ2d0dF9v
ZmZzZXRfdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJICAgICAgZW51
bSBpOTE1X2dndHRfdmlld190eXBlIHZpZXcpCit7CisJcmV0dXJuIGk5MTVfZ2VtX29ial9vZmZz
ZXRfdmlldyhvYmosIGk5MTVfb2JqX3RvX2dndHQob2JqKSwgdmlldyk7Cit9CisKK3N0YXRpYyBp
bmxpbmUgdW5zaWduZWQgbG9uZwogaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX29iamVjdCAqb2JqKQogewogCXJldHVybiBpOTE1X2dlbV9vYmpfc2l6ZShvYmosIGk5
MTVfb2JqX3RvX2dndHQob2JqKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBlY2VkZGE1
Li5iYTk5YmZlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTUxODEsOCArNTE4MSw4IEBA
IHVuc2lnbmVkIGxvbmcgaTkxNV9nZW1fb2JqX29mZnNldF92aWV3KHN0cnVjdCBkcm1faTkxNV9n
ZW1fb2JqZWN0ICpvLAogCQkJcmV0dXJuIHZtYS0+bm9kZS5zdGFydDsKIAogCX0KLQlXQVJOKDEs
ICIlcyB2bWEgZm9yIHRoaXMgb2JqZWN0IG5vdCBmb3VuZC5cbiIsCi0JICAgICBpOTE1X2lzX2dn
dHQodm0pID8gImdsb2JhbCIgOiAicHBndHQiKTsKKwlXQVJOKDEsICIlcyB2bWEgZm9yIHRoaXMg
b2JqZWN0IG5vdCBmb3VuZC4gKHZpZXc9JXUpXG4iLAorCSAgICAgaTkxNV9pc19nZ3R0KHZtKSA/
ICJnbG9iYWwiIDogInBwZ3R0Iiwgdmlldyk7CiAJcmV0dXJuIC0xOwogfQogCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOTg2N2Y1NS4uYzdlYWQzNSAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjI1OCw4ICsyMjU4LDcgQEAgaW50IGludGVsX2Zp
bGxfZmJfZ2d0dF92aWV3KHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldywKIAlpZiAoIXBsYW5l
X3N0YXRlKQogCQlyZXR1cm4gMDsKIAotCWlmICghKHBsYW5lX3N0YXRlLT5yb3RhdGlvbiAmCi0J
ICAgIChCSVQoRFJNX1JPVEFURV85MCkgfCBCSVQoRFJNX1JPVEFURV8yNzApKSkpCisJaWYgKCFp
bnRlbF9yb3RhdGlvbl85MF9vcl8yNzAocGxhbmVfc3RhdGUtPnJvdGF0aW9uKSkKIAkJcmV0dXJu
IDA7CiAKIAkqdmlldyA9IHJvdGF0ZWRfdmlldzsKQEAgLTI4NjQsNiArMjg2MywxNyBAQCB1MzIg
aW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50NjRf
dCBmYl9tb2RpZmllciwKIAl9CiB9CiAKK3Vuc2lnbmVkIGxvbmcgaW50ZWxfcGxhbmVfb2JqX29m
ZnNldChzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lLAorCQkJCSAgICAgc3RydWN0IGRy
bV9pOTE1X2dlbV9vYmplY3QgKm9iaikKK3sKKwllbnVtIGk5MTVfZ2d0dF92aWV3X3R5cGUgdmll
dyA9IEk5MTVfR0dUVF9WSUVXX05PUk1BTDsKKworCWlmIChpbnRlbF9yb3RhdGlvbl85MF9vcl8y
NzAoaW50ZWxfcGxhbmUtPmJhc2Uuc3RhdGUtPnJvdGF0aW9uKSkKKwkJdmlldyA9IEk5MTVfR0dU
VF9WSUVXX1JPVEFURUQ7CisKKwlyZXR1cm4gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0X3ZpZXco
b2JqLCB2aWV3KTsKK30KKwogc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFu
ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJCSBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpm
YiwKIAkJCQkJIGludCB4LCBpbnQgeSkKQEAgLTI4NzQsNiArMjg4NCw3IEBAIHN0YXRpYyB2b2lk
IHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0
cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5w
aXBlOwogCXUzMiBwbGFuZV9jdGwsIHN0cmlkZV9kaXY7CisJdW5zaWduZWQgbG9uZyBzdXJmX2Fk
ZHI7CiAKIAlpZiAoIWludGVsX2NydGMtPnByaW1hcnlfZW5hYmxlZCkgewogCQlJOTE1X1dSSVRF
KFBMQU5FX0NUTChwaXBlLCAwKSwgMCk7CkBAIC0yOTQwLDExICsyOTUxLDEyIEBAIHN0YXRpYyB2
b2lkIHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAog
CW9iaiA9IGludGVsX2ZiX29iaihmYik7CiAJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9h
bGlnbm1lbnQoZGV2LCBmYi0+bW9kaWZpZXJbMF0sCiAJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9y
bWF0KTsKKwlzdXJmX2FkZHIgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHRvX2ludGVsX3BsYW5l
KGNydGMtPnByaW1hcnkpLCBvYmopOwogCiAJSTkxNV9XUklURShQTEFORV9DVEwocGlwZSwgMCks
IHBsYW5lX2N0bCk7CiAKIAlEUk1fREVCVUdfS01TKCJXcml0aW5nIGJhc2UgJTA4bFggJWQsJWQs
JWQsJWQgcGl0Y2g9JWRcbiIsCi0JCSAgICAgIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmop
LAorCQkgICAgICBzdXJmX2FkZHIsCiAJCSAgICAgIHgsIHksIGZiLT53aWR0aCwgZmItPmhlaWdo
dCwKIAkJICAgICAgZmItPnBpdGNoZXNbMF0pOwogCkBAIC0yOTU0LDcgKzI5NjYsNyBAQCBzdGF0
aWMgdm9pZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0
YywKIAkJICAgKGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaCAtIDEpIDw8IDE2IHwKIAkJ
ICAgKGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdyAtIDEpKTsKIAlJOTE1X1dSSVRFKFBM
QU5FX1NUUklERShwaXBlLCAwKSwgZmItPnBpdGNoZXNbMF0gLyBzdHJpZGVfZGl2KTsKLQlJOTE1
X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgMCksIGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmop
KTsKKwlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgMCksIHN1cmZfYWRkcik7CiAKIAlQT1NU
SU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCAwKSk7CiB9CkBAIC05OTg3LDggKzk5OTksOCBAQCBz
dGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlp
ZiAocmV0KQogCQlnb3RvIGNsZWFudXBfcGVuZGluZzsKIAotCXdvcmstPmd0dF9vZmZzZXQgPQot
CQlpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArIGludGVsX2NydGMtPmRzcGFkZHJfb2Zm
c2V0OworCXdvcmstPmd0dF9vZmZzZXQgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHRvX2ludGVs
X3BsYW5lKHByaW1hcnkpLCBvYmopCisJCQkJCQkgICsgaW50ZWxfY3J0Yy0+ZHNwYWRkcl9vZmZz
ZXQ7CiAKIAlpZiAodXNlX21taW9fZmxpcChyaW5nLCBvYmopKSB7CiAJCXJldCA9IGludGVsX3F1
ZXVlX21taW9fZmxpcChkZXYsIGNydGMsIGZiLCBvYmosIHJpbmcsCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rydi5oCmluZGV4IDY3YjIxY2YuLmQ1N2I5YjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o
CkBAIC05ODcsNiArOTg3LDEyIEBAIHVuc2lnbmVkIGludAogaW50ZWxfdGlsZV9oZWlnaHQoc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiwgdWludDMyX3QgcGl4ZWxfZm9ybWF0LAogCQkgIHVpbnQ2NF90
IGZiX2Zvcm1hdF9tb2RpZmllcik7CiAKK3N0YXRpYyBpbmxpbmUgYm9vbAoraW50ZWxfcm90YXRp
b25fOTBfb3JfMjcwKHVuc2lnbmVkIGludCByb3RhdGlvbikKK3sKKwlyZXR1cm4gcm90YXRpb24g
JiAoQklUKERSTV9ST1RBVEVfOTApIHwgQklUKERSTV9ST1RBVEVfMjcwKSk7Cit9CisKIC8qIHNo
YXJlZCBkcGxsIGZ1bmN0aW9ucyAqLwogc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9j
cnRjX3RvX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKTsKIHZvaWQgYXNzZXJ0
X3NoYXJlZF9kcGxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKQEAgLTEwNDEs
NiArMTA0Nyw5IEBAIHZvaWQgaW50ZWxfbW9kZV9mcm9tX3BpcGVfY29uZmlnKHN0cnVjdCBkcm1f
ZGlzcGxheV9tb2RlICptb2RlLAogdm9pZCBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxp
cHMoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfbW9kZXNldF9wcmVjbG9zZShz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogCit1bnNpZ25l
ZCBsb25nIGludGVsX3BsYW5lX29ial9vZmZzZXQoc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9w
bGFuZSwKKwkJCQkgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopOworCiAvKiBp
bnRlbF9kcC5jICovCiB2b2lkIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg
aW50IG91dHB1dF9yZWcsIGVudW0gcG9ydCBwb3J0KTsKIGJvb2wgaW50ZWxfZHBfaW5pdF9jb25u
ZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDcwNTFkYTcuLmNhYTBiY2MgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xOTEsNiArMTkxLDcgQEAgc2tsX3VwZGF0ZV9wbGFu
ZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlj
b25zdCBpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxhbmUgKyAxOwogCXUzMiBwbGFuZV9jdGws
IHN0cmlkZV9kaXY7CiAJaW50IHBpeGVsX3NpemUgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+
cGl4ZWxfZm9ybWF0LCAwKTsKKwl1bnNpZ25lZCBsb25nIHN1cmZfYWRkcjsKIAogCXBsYW5lX2N0
bCA9IEk5MTVfUkVBRChQTEFORV9DVEwocGlwZSwgcGxhbmUpKTsKIApAQCAtMjgwLDEyICsyODEs
MTQgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVj
dCBkcm1fY3J0YyAqY3J0YywKIAljcnRjX3ctLTsKIAljcnRjX2gtLTsKIAorCXN1cmZfYWRkciA9
IGludGVsX3BsYW5lX29ial9vZmZzZXQoaW50ZWxfcGxhbmUsIG9iaik7CisKIAlJOTE1X1dSSVRF
KFBMQU5FX09GRlNFVChwaXBlLCBwbGFuZSksICh5IDw8IDE2KSB8IHgpOwogCUk5MTVfV1JJVEUo
UExBTkVfU1RSSURFKHBpcGUsIHBsYW5lKSwgZmItPnBpdGNoZXNbMF0gLyBzdHJpZGVfZGl2KTsK
IAlJOTE1X1dSSVRFKFBMQU5FX1BPUyhwaXBlLCBwbGFuZSksIChjcnRjX3kgPDwgMTYpIHwgY3J0
Y194KTsKIAlJOTE1X1dSSVRFKFBMQU5FX1NJWkUocGlwZSwgcGxhbmUpLCAoY3J0Y19oIDw8IDE2
KSB8IGNydGNfdyk7CiAJSTkxNV9XUklURShQTEFORV9DVEwocGlwZSwgcGxhbmUpLCBwbGFuZV9j
dGwpOwotCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCBwbGFuZSksIGk5MTVfZ2VtX29ial9n
Z3R0X29mZnNldChvYmopKTsKKwlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgcGxhbmUpLCBz
dXJmX2FkZHIpOwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUsIHBsYW5lKSk7CiB9CiAK
LS0gCjIuMy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=