From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v3 3/3] drm/i915: tidy up a few leftovers
Date: Thu,  7 Jan 2016 10:20:52 +0000
Message-ID: <1452162052-22573-4-git-send-email-david.s.gordon@intel.com>
References: <1452162052-22573-1-git-send-email-david.s.gordon@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 mga14.intel.com (mga14.intel.com [192.55.52.115])
 by gabe.freedesktop.org (Postfix) with ESMTP id 5F1F88A2A7
 for <intel-gfx@lists.freedesktop.org>; Thu,  7 Jan 2016 02:21:02 -0800 (PST)
In-Reply-To: <1452162052-22573-1-git-send-email-david.s.gordon@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

VGhlcmUgYXJlIGEgZmV3IGJpdHMgb2YgY29kZSB3aGljaCB0aGUgdHJhbnNmb3JtYXRpb25zIGlt
cGxlbWVudGVkIGJ5CnRoZSBwcmV2aW91cyBwYXRjaCByZXZlYWwgdG8gYmUgc3Vib3B0aW1hbCwg
b25jZSB0aGUgbm90aW9uIG9mIGEgcGVyLQpyaW5nIGRlZmF1bHQgY29udGV4dCBoYXMgZ29uZSBh
d2F5LiBTbyB0aGlzIHRpZGllcyB1cCB0aGUgbGVmdG92ZXJzLgoKSXQgY291bGQgaGF2ZSBiZWVu
IHNxdWFzaGVkIGludG8gdGhlIHByZXZpb3VzIHBhdGNoLCBidXQgdGhhdCB3b3VsZCBoYXZlCm1h
ZGUgdGhhdCBwYXRjaCBsZXNzIGNsZWFybHkgYSBzaW1wbGUgdHJhbnNmb3JtYXRpb24uIEluIHBh
cnRpY3VsYXIsIGFueQpjaGFuZ2Ugd2hpY2ggYWx0ZXJzIHRoZSBjb2RlIGJsb2NrIHN0cnVjdHVy
ZSBvciBpbmRlbnRhdGlvbiBoYXMgYmVlbgpkZWZlcnJlZCBpbnRvIHRoaXMgc2VwYXJhdGUgcGF0
Y2gsIGJlY2F1c2Ugc3VjaCB0aGluZ3MgdGVuZCB0byBtYWtlIGRpZmZzCm1vcmUgZGlmZmljdWx0
IHRvIHJlYWQuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50
ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgMTUgKysr
KystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICB8ICA2ICsr
LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgfCAzOCArKysrKysrKysr
KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlv
bnMoKyksIDM1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5k
ZXggMjYxMzcwOC4uYmJiMjNkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAg
LTE5NDIsMTEgKzE5NDIsOCBAQCBzdGF0aWMgaW50IGk5MTVfY29udGV4dF9zdGF0dXMoc3RydWN0
IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAKIAkJc2VxX3B1dHMobSwgIkhXIGNvbnRleHQg
Iik7CiAJCWRlc2NyaWJlX2N0eChtLCBjdHgpOwotCQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9w
cml2LCBpKSB7Ci0JCQlpZiAoZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0ID09IGN0eCkKLQkJCQlz
ZXFfcHJpbnRmKG0sICIoZGVmYXVsdCBjb250ZXh0ICVzKSAiLAotCQkJCQkgICByaW5nLT5uYW1l
KTsKLQkJfQorCQlpZiAoY3R4ID09IGRldl9wcml2LT5rZXJuZWxfY29udGV4dCkKKwkJCXNlcV9w
cmludGYobSwgIihrZXJuZWwgY29udGV4dCkgIik7CiAKIAkJaWYgKGk5MTUuZW5hYmxlX2V4ZWNs
aXN0cykgewogCQkJc2VxX3B1dGMobSwgJ1xuJyk7CkBAIC0yMDM3LDEzICsyMDM0LDExIEBAIHN0
YXRpYyBpbnQgaTkxNV9kdW1wX2xyYyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkK
IAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShjdHgsICZk
ZXZfcHJpdi0+Y29udGV4dF9saXN0LCBsaW5rKSB7Ci0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2
X3ByaXYsIGkpIHsKLQkJCWlmIChkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQgIT0gY3R4KQorCWxp
c3RfZm9yX2VhY2hfZW50cnkoY3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykKKwkJ
aWYgKGN0eCAhPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQpCisJCQlmb3JfZWFjaF9yaW5nKHJp
bmcsIGRldl9wcml2LCBpKQogCQkJCWk5MTVfZHVtcF9scmNfb2JqKG0sIHJpbmcsCiAJCQkJCQkg
IGN0eC0+ZW5naW5lW2ldLnN0YXRlKTsKLQkJfQotCX0KIAogCW11dGV4X3VubG9jaygmZGV2LT5z
dHJ1Y3RfbXV0ZXgpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA4ZjEwMTEyMS4uNGY0
NWViMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNjc3LDEwICsyNjc3LDggQEAgdm9p
ZCBpOTE1X2dlbV9yZXF1ZXN0X2ZyZWUoc3RydWN0IGtyZWYgKnJlcV9yZWYpCiAJCWk5MTVfZ2Vt
X3JlcXVlc3RfcmVtb3ZlX2Zyb21fY2xpZW50KHJlcSk7CiAKIAlpZiAoY3R4KSB7Ci0JCWlmIChp
OTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKLQkJCWlmIChjdHggIT0gcmVxLT5pOTE1LT5rZXJuZWxf
Y29udGV4dCkKLQkJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJlcSk7Ci0JCX0KKwkJaWYgKGk5
MTUuZW5hYmxlX2V4ZWNsaXN0cyAmJiBjdHggIT0gcmVxLT5pOTE1LT5rZXJuZWxfY29udGV4dCkK
KwkJCWludGVsX2xyX2NvbnRleHRfdW5waW4ocmVxKTsKIAogCQlpOTE1X2dlbV9jb250ZXh0X3Vu
cmVmZXJlbmNlKGN0eCk7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCBhYWFhNWEz
Li44YzRjOWI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNjYwLDE2ICs2NjAsMTAg
QEAgc3RhdGljIGludCBleGVjbGlzdHNfbW92ZV90b19ncHUoc3RydWN0IGRybV9pOTE1X2dlbV9y
ZXF1ZXN0ICpyZXEsCiAKIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRy
YXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewotCWludCByZXQ7CisJ
aW50IHJldCA9IDA7CiAKIAlyZXF1ZXN0LT5yaW5nYnVmID0gcmVxdWVzdC0+Y3R4LT5lbmdpbmVb
cmVxdWVzdC0+cmluZy0+aWRdLnJpbmdidWY7CiAKLQlpZiAocmVxdWVzdC0+Y3R4ICE9IHJlcXVl
c3QtPmk5MTUtPmtlcm5lbF9jb250ZXh0KSB7Ci0JCXJldCA9IGludGVsX2xyX2NvbnRleHRfcGlu
KHJlcXVlc3QpOwotCQlpZiAocmV0KQotCQkJcmV0dXJuIHJldDsKLQl9Ci0KIAlpZiAoaTkxNS5l
bmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKIAkJLyoKIAkJICogQ2hlY2sgdGhhdCB0aGUgR3VDIGhh
cyBzcGFjZSBmb3IgdGhlIHJlcXVlc3QgYmVmb3JlCkBAIC02ODMsNyArNjc3LDEwIEBAIGludCBp
bnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dl
bV9yZXF1ZXN0ICpyZXF1ZXN0CiAJCQlyZXR1cm4gcmV0OwogCX0KIAotCXJldHVybiAwOworCWlm
IChyZXF1ZXN0LT5jdHggIT0gcmVxdWVzdC0+aTkxNS0+a2VybmVsX2NvbnRleHQpCisJCXJldCA9
IGludGVsX2xyX2NvbnRleHRfcGluKHJlcXVlc3QpOworCisJcmV0dXJuIHJldDsKIH0KIAogc3Rh
dGljIGludCBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9y
ZXF1ZXN0ICpyZXEsCkBAIC0yMzgyLDIyICsyMzc5LDIxIEBAIHZvaWQgaW50ZWxfbHJfY29udGV4
dF9mcmVlKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiB7CiAJaW50IGk7CiAKLQlmb3IgKGkg
PSAwOyBpIDwgSTkxNV9OVU1fUklOR1M7IGkrKykgeworCWZvciAoaSA9IEk5MTVfTlVNX1JJTkdT
OyAtLWkgPj0gMDsgKSB7CisJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gY3R4
LT5lbmdpbmVbaV0ucmluZ2J1ZjsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9v
YmogPSBjdHgtPmVuZ2luZVtpXS5zdGF0ZTsKIAotCQlpZiAoY3R4X29iaikgewotCQkJc3RydWN0
IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPQotCQkJCQljdHgtPmVuZ2luZVtpXS5yaW5nYnVm
OwotCQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7CisJCWlm
ICghY3R4X29iaikKKwkJCWNvbnRpbnVlOwogCi0JCQlpZiAoY3R4ID09IGN0eC0+aTkxNS0+a2Vy
bmVsX2NvbnRleHQpIHsKLQkJCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsK
LQkJCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKLQkJCX0KLQkJCVdBUk5f
T04oY3R4LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCk7Ci0JCQlpbnRlbF9yaW5nYnVmZmVy
X2ZyZWUocmluZ2J1Zik7Ci0JCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmY3R4X29iai0+
YmFzZSk7CisJCWlmIChjdHggPT0gY3R4LT5pOTE1LT5rZXJuZWxfY29udGV4dCkgeworCQkJaW50
ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoocmluZ2J1Zik7CisJCQlpOTE1X2dlbV9vYmplY3RfZ2d0
dF91bnBpbihjdHhfb2JqKTsKIAkJfQorCisJCVdBUk5fT04oY3R4LT5lbmdpbmVbaV0ucGluX2Nv
dW50KTsKKwkJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOworCQlkcm1fZ2VtX29iamVj
dF91bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CiAJfQogfQogCkBAIC0yNDcyLDcgKzI0Njgs
NyBAQCBzdGF0aWMgdm9pZCBscmNfc2V0dXBfaGFyZHdhcmVfc3RhdHVzX3BhZ2Uoc3RydWN0IGlu
dGVsX2VuZ2luZV9jcyAqcmluZywKICAqLwogCiBpbnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJl
ZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAotCQkJCSAgICAgc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqcmluZykKKwkJCQkgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykK
IHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwogCXN0cnVjdCBkcm1faTkx
NV9nZW1fb2JqZWN0ICpjdHhfb2JqOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4
QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt
YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==