From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tursulin@ursulin.net>
Subject: [PATCH 3/5] drm/i915: Further assorted dev_priv cleanups
Date: Fri,  4 Nov 2016 14:42:46 +0000
Message-ID: <1478270568-7902-4-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1478270568-7902-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 mail-wm0-x241.google.com (mail-wm0-x241.google.com
 [IPv6:2a00:1450:400c:c09::241])
 by gabe.freedesktop.org (Postfix) with ESMTPS id F0C216E9A3
 for <Intel-gfx@lists.freedesktop.org>; Fri,  4 Nov 2016 14:42:59 +0000 (UTC)
Received: by mail-wm0-x241.google.com with SMTP id 68so4239468wmz.2
 for <Intel-gfx@lists.freedesktop.org>; Fri, 04 Nov 2016 07:42:59 -0700 (PDT)
In-Reply-To: <1478270568-7902-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkEgc21hbGwg
c2VsZWN0aW9uIG9mIG1hY3JvcyB3aGljaCBjYW4gb25seSBhY2NlcHQgZGV2X3ByaXYgZnJvbQpu
b3cgb24gYW5kIGEgcmVzdWx0aW5nIHRyaWNrbGUgb2YgZml4dXBzLgoKU2lnbmVkLW9mZi1ieTog
VHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAxMiArKysrKystLS0tLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAyICstCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jICAgIHwgMTAgKysrKystLS0tLQogNCBmaWxlcyBjaGFu
Z2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k
cnYuaAppbmRleCA2MDYwZTQxZDI1ZTUuLmYzOTJiMGZiOWI4NiAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2Rydi5oCkBAIC0yNzAwLDcgKzI3MDAsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfY21kX3RhYmxlIHsK
ICNkZWZpbmUgSU5URUxfREVWSUQoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmRldmljZV9p
ZCkKIAogI2RlZmluZSBSRVZJRF9GT1JFVkVSCQkweGZmCi0jZGVmaW5lIElOVEVMX1JFVklEKHAp
CShfX0k5MTVfXyhwKS0+ZHJtLnBkZXYtPnJldmlzaW9uKQorI2RlZmluZSBJTlRFTF9SRVZJRChk
ZXZfcHJpdikJKChkZXZfcHJpdiktPmRybS5wZGV2LT5yZXZpc2lvbikKIAogI2RlZmluZSBHRU5f
Rk9SRVZFUiAoMCkKIC8qCkBAIC0yOTI1LDEzICsyOTI1LDEzIEBAIHN0cnVjdCBkcm1faTkxNV9j
bWRfdGFibGUgewogICogY29tbWFuZCBzdWJtaXNzaW9uIG9uY2UgbG9hZGVkLiBCdXQgdGhlc2Ug
YXJlIGxvZ2ljYWxseSBpbmRlcGVuZGVudAogICogcHJvcGVydGllcywgc28gd2UgaGF2ZSBzZXBh
cmF0ZSBtYWNyb3MgdG8gdGVzdCB0aGVtLgogICovCi0jZGVmaW5lIEhBU19HVUMoZGV2KQkJKElO
VEVMX0lORk8oZGV2KS0+aGFzX2d1YykKLSNkZWZpbmUgSEFTX0dVQ19VQ09ERShkZXYpCShIQVNf
R1VDKGRldikpCi0jZGVmaW5lIEhBU19HVUNfU0NIRUQoZGV2KQkoSEFTX0dVQyhkZXYpKQorI2Rl
ZmluZSBIQVNfR1VDKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5oYXNfZ3VjKQorI2RlZmlu
ZSBIQVNfR1VDX1VDT0RFKGRldl9wcml2KQkoSEFTX0dVQyhkZXZfcHJpdikpCisjZGVmaW5lIEhB
U19HVUNfU0NIRUQoZGV2X3ByaXYpCShIQVNfR1VDKGRldl9wcml2KSkKIAotI2RlZmluZSBIQVNf
UkVTT1VSQ0VfU1RSRUFNRVIoZGV2KSAoSU5URUxfSU5GTyhkZXYpLT5oYXNfcmVzb3VyY2Vfc3Ry
ZWFtZXIpCisjZGVmaW5lIEhBU19SRVNPVVJDRV9TVFJFQU1FUihkZXZfcHJpdikgKChkZXZfcHJp
diktPmluZm8uaGFzX3Jlc291cmNlX3N0cmVhbWVyKQogCi0jZGVmaW5lIEhBU19QT09MRURfRVUo
ZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5oYXNfcG9vbGVkX2V1KQorI2RlZmluZSBIQVNfUE9PTEVE
X0VVKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5oYXNfcG9vbGVkX2V1KQogCiAjZGVmaW5l
IElOVEVMX1BDSF9ERVZJQ0VfSURfTUFTSwkJMHhmZjAwCiAjZGVmaW5lIElOVEVMX1BDSF9JQlhf
REVWSUNFX0lEX1RZUEUJCTB4M2IwMApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhl
Y2J1ZmZlci5jCmluZGV4IDljN2Q5Yzg4ZDg3OS4uZjk4OTIxMTc0MTYxIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xNjE2LDcgKzE2MTYsNyBAQCBp
OTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEs
CiAJfQogCiAJaWYgKGFyZ3MtPmZsYWdzICYgSTkxNV9FWEVDX1JFU09VUkNFX1NUUkVBTUVSKSB7
Ci0JCWlmICghSEFTX1JFU09VUkNFX1NUUkVBTUVSKGRldikpIHsKKwkJaWYgKCFIQVNfUkVTT1VS
Q0VfU1RSRUFNRVIoZGV2X3ByaXYpKSB7CiAJCQlEUk1fREVCVUcoIlJTIGlzIG9ubHkgYWxsb3dl
ZCBmb3IgSGFzd2VsbCwgR2VuOCBhbmQgYWJvdmVcbiIpOwogCQkJcmV0dXJuIC1FSU5WQUw7CiAJ
CX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDI4NWVlMWU0MzUyYS4uY2I4YTc1ZjZjYTE2
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTQxNDUsNyArNDE0NSw3IEBAIHZvaWQgaW50
ZWxfaXJxX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCUlOSVRfV09S
SygmZGV2X3ByaXYtPnJwcy53b3JrLCBnZW42X3BtX3Jwc193b3JrKTsKIAlJTklUX1dPUksoJmRl
dl9wcml2LT5sM19wYXJpdHkuZXJyb3Jfd29yaywgaXZ5YnJpZGdlX3Bhcml0eV93b3JrKTsKIAot
CWlmIChIQVNfR1VDX1NDSEVEKGRldikpCisJaWYgKEhBU19HVUNfU0NIRUQoZGV2X3ByaXYpKQog
CQlkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyA9IEdFTjlfR1VDX1RPX0hPU1RfSU5UX0VWRU5UOwog
CiAJLyogTGV0J3MgdHJhY2sgdGhlIGVuYWJsZWQgcnBzIGV2ZW50cyAqLwpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDFhYTg1MjM2Yjc4OC4uMzRkNmFkMmNmN2Mx
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC01NjYsNyArNTY2
LDcgQEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXQg
PSAwOwogCX0KIAotCWlmIChlcnIgPT0gMCAmJiAhSEFTX0dVQ19VQ09ERShkZXYpKQorCWlmIChl
cnIgPT0gMCAmJiAhSEFTX0dVQ19VQ09ERShkZXZfcHJpdikpCiAJCTsJLyogRG9uJ3QgbWVudGlv
biB0aGUgR3VDISAqLwogCWVsc2UgaWYgKGVyciA9PSAwKQogCQlEUk1fSU5GTygiR3VDIGZpcm13
YXJlIGxvYWQgc2tpcHBlZFxuIik7CkBAIC03MjUsMTggKzcyNSwxOCBAQCB2b2lkIGludGVsX2d1
Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGludGVsX2d1Y19mdyAqZ3Vj
X2Z3ID0gJmRldl9wcml2LT5ndWMuZ3VjX2Z3OwogCWNvbnN0IGNoYXIgKmZ3X3BhdGg7CiAKLQlp
ZiAoIUhBU19HVUMoZGV2KSkgeworCWlmICghSEFTX0dVQyhkZXZfcHJpdikpIHsKIAkJaTkxNS5l
bmFibGVfZ3VjX2xvYWRpbmcgPSAwOwogCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IDA7
CiAJfSBlbHNlIHsKIAkJLyogQSBuZWdhdGl2ZSB2YWx1ZSBtZWFucyAidXNlIHBsYXRmb3JtIGRl
ZmF1bHQiICovCiAJCWlmIChpOTE1LmVuYWJsZV9ndWNfbG9hZGluZyA8IDApCi0JCQlpOTE1LmVu
YWJsZV9ndWNfbG9hZGluZyA9IEhBU19HVUNfVUNPREUoZGV2KTsKKwkJCWk5MTUuZW5hYmxlX2d1
Y19sb2FkaW5nID0gSEFTX0dVQ19VQ09ERShkZXZfcHJpdik7CiAJCWlmIChpOTE1LmVuYWJsZV9n
dWNfc3VibWlzc2lvbiA8IDApCi0JCQlpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbiA9IEhBU19H
VUNfU0NIRUQoZGV2KTsKKwkJCWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uID0gSEFTX0dVQ19T
Q0hFRChkZXZfcHJpdik7CiAJfQogCi0JaWYgKCFIQVNfR1VDX1VDT0RFKGRldikpIHsKKwlpZiAo
IUhBU19HVUNfVUNPREUoZGV2X3ByaXYpKSB7CiAJCWZ3X3BhdGggPSBOVUxMOwogCX0gZWxzZSBp
ZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpIHsKIAkJZndfcGF0aCA9IEk5MTVfU0tMX0dVQ19VQ09E
RTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v
cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n
ZngK