From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Hoath <nicholas.hoath@intel.com>
Subject: Re: [PATCH v3 3/3] drm/i915: tidy up a few leftovers
Date: Mon, 18 Jan 2016 16:17:07 +0000
Message-ID: <569D1003.1040806@intel.com>
References: <1452162052-22573-1-git-send-email-david.s.gordon@intel.com>
 <1452162052-22573-4-git-send-email-david.s.gordon@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"; Format="flowed"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id DAC746E5F0
 for <intel-gfx@lists.freedesktop.org>; Mon, 18 Jan 2016 08:17:09 -0800 (PST)
In-Reply-To: <1452162052-22573-4-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: Dave Gordon <david.s.gordon@intel.com>, "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
List-Id: intel-gfx@lists.freedesktop.org

T24gMDcvMDEvMjAxNiAxMDoyMCwgRGF2ZSBHb3Jkb24gd3JvdGU6Cj4gVGhlcmUgYXJlIGEgZmV3
IGJpdHMgb2YgY29kZSB3aGljaCB0aGUgdHJhbnNmb3JtYXRpb25zIGltcGxlbWVudGVkIGJ5Cj4g
dGhlIHByZXZpb3VzIHBhdGNoIHJldmVhbCB0byBiZSBzdWJvcHRpbWFsLCBvbmNlIHRoZSBub3Rp
b24gb2YgYSBwZXItCj4gcmluZyBkZWZhdWx0IGNvbnRleHQgaGFzIGdvbmUgYXdheS4gU28gdGhp
cyB0aWRpZXMgdXAgdGhlIGxlZnRvdmVycy4KPgo+IEl0IGNvdWxkIGhhdmUgYmVlbiBzcXVhc2hl
ZCBpbnRvIHRoZSBwcmV2aW91cyBwYXRjaCwgYnV0IHRoYXQgd291bGQgaGF2ZQo+IG1hZGUgdGhh
dCBwYXRjaCBsZXNzIGNsZWFybHkgYSBzaW1wbGUgdHJhbnNmb3JtYXRpb24uIEluIHBhcnRpY3Vs
YXIsIGFueQo+IGNoYW5nZSB3aGljaCBhbHRlcnMgdGhlIGNvZGUgYmxvY2sgc3RydWN0dXJlIG9y
IGluZGVudGF0aW9uIGhhcyBiZWVuCj4gZGVmZXJyZWQgaW50byB0aGlzIHNlcGFyYXRlIHBhdGNo
LCBiZWNhdXNlIHN1Y2ggdGhpbmdzIHRlbmQgdG8gbWFrZSBkaWZmcwo+IG1vcmUgZGlmZmljdWx0
IHRvIHJlYWQuCj4KPiBTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25A
aW50ZWwuY29tPgoKUmV2aWV3ZWQtYnk6IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVs
LmNvbT4KCj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE1
ICsrKysrLS0tLS0tLS0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg
fCAgNiArKy0tLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgIHwgMzgg
KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAgMyBmaWxlcyBjaGFuZ2Vk
LCAyNCBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZGVidWdmcy5jCj4gaW5kZXggMjYxMzcwOC4uYmJiMjNkYSAxMDA2NDQKPiAtLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZGVidWdmcy5jCj4gQEAgLTE5NDIsMTEgKzE5NDIsOCBAQCBzdGF0aWMgaW50IGk5
MTVfY29udGV4dF9zdGF0dXMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCj4KPiAg
IAkJc2VxX3B1dHMobSwgIkhXIGNvbnRleHQgIik7Cj4gICAJCWRlc2NyaWJlX2N0eChtLCBjdHgp
Owo+IC0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKPiAtCQkJaWYgKGRldl9w
cml2LT5rZXJuZWxfY29udGV4dCA9PSBjdHgpCj4gLQkJCQlzZXFfcHJpbnRmKG0sICIoZGVmYXVs
dCBjb250ZXh0ICVzKSAiLAo+IC0JCQkJCSAgIHJpbmctPm5hbWUpOwo+IC0JCX0KPiArCQlpZiAo
Y3R4ID09IGRldl9wcml2LT5rZXJuZWxfY29udGV4dCkKPiArCQkJc2VxX3ByaW50ZihtLCAiKGtl
cm5lbCBjb250ZXh0KSAiKTsKPgo+ICAgCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Cj4g
ICAJCQlzZXFfcHV0YyhtLCAnXG4nKTsKPiBAQCAtMjAzNywxMyArMjAzNCwxMSBAQCBzdGF0aWMg
aW50IGk5MTVfZHVtcF9scmMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCj4gICAJ
aWYgKHJldCkKPiAgIAkJcmV0dXJuIHJldDsKPgo+IC0JbGlzdF9mb3JfZWFjaF9lbnRyeShjdHgs
ICZkZXZfcHJpdi0+Y29udGV4dF9saXN0LCBsaW5rKSB7Cj4gLQkJZm9yX2VhY2hfcmluZyhyaW5n
LCBkZXZfcHJpdiwgaSkgewo+IC0JCQlpZiAoZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0ICE9IGN0
eCkKPiArCWxpc3RfZm9yX2VhY2hfZW50cnkoY3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwg
bGluaykKPiArCQlpZiAoY3R4ICE9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dCkKPiArCQkJZm9y
X2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKPiAgIAkJCQlpOTE1X2R1bXBfbHJjX29iaiht
LCByaW5nLAo+ICAgCQkJCQkJICBjdHgtPmVuZ2luZVtpXS5zdGF0ZSk7Cj4gLQkJfQo+IC0JfQo+
Cj4gICAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4KPiBkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtLmMKPiBpbmRleCA4ZjEwMTEyMS4uNGY0NWViMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW0uYwo+IEBAIC0yNjc3LDEwICsyNjc3LDggQEAgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2Zy
ZWUoc3RydWN0IGtyZWYgKnJlcV9yZWYpCj4gICAJCWk5MTVfZ2VtX3JlcXVlc3RfcmVtb3ZlX2Zy
b21fY2xpZW50KHJlcSk7Cj4KPiAgIAlpZiAoY3R4KSB7Cj4gLQkJaWYgKGk5MTUuZW5hYmxlX2V4
ZWNsaXN0cykgewo+IC0JCQlpZiAoY3R4ICE9IHJlcS0+aTkxNS0+a2VybmVsX2NvbnRleHQpCj4g
LQkJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJlcSk7Cj4gLQkJfQo+ICsJCWlmIChpOTE1LmVu
YWJsZV9leGVjbGlzdHMgJiYgY3R4ICE9IHJlcS0+aTkxNS0+a2VybmVsX2NvbnRleHQpCj4gKwkJ
CWludGVsX2xyX2NvbnRleHRfdW5waW4ocmVxKTsKPgo+ICAgCQlpOTE1X2dlbV9jb250ZXh0X3Vu
cmVmZXJlbmNlKGN0eCk7Cj4gICAJfQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gaW5kZXgg
YWFhYTVhMy4uOGM0YzliOSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9scmMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gQEAgLTY2
MCwxNiArNjYwLDEwIEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBk
cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAo+Cj4gICBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2Fs
bG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkK
PiAgIHsKPiAtCWludCByZXQ7Cj4gKwlpbnQgcmV0ID0gMDsKPgo+ICAgCXJlcXVlc3QtPnJpbmdi
dWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVtyZXF1ZXN0LT5yaW5nLT5pZF0ucmluZ2J1ZjsKPgo+
IC0JaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5pOTE1LT5rZXJuZWxfY29udGV4dCkgewo+
IC0JCXJldCA9IGludGVsX2xyX2NvbnRleHRfcGluKHJlcXVlc3QpOwo+IC0JCWlmIChyZXQpCj4g
LQkJCXJldHVybiByZXQ7Cj4gLQl9Cj4gLQo+ICAgCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlz
c2lvbikgewo+ICAgCQkvKgo+ICAgCQkgKiBDaGVjayB0aGF0IHRoZSBHdUMgaGFzIHNwYWNlIGZv
ciB0aGUgcmVxdWVzdCBiZWZvcmUKPiBAQCAtNjgzLDcgKzY3NywxMCBAQCBpbnQgaW50ZWxfbG9n
aWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz
dCAqcmVxdWVzdAo+ICAgCQkJcmV0dXJuIHJldDsKPiAgIAl9Cj4KPiAtCXJldHVybiAwOwo+ICsJ
aWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5pOTE1LT5rZXJuZWxfY29udGV4dCkKPiArCQly
ZXQgPSBpbnRlbF9scl9jb250ZXh0X3BpbihyZXF1ZXN0KTsKPiArCj4gKwlyZXR1cm4gcmV0Owo+
ICAgfQo+Cj4gICBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3Qg
ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKPiBAQCAtMjM4MiwyMiArMjM3OSwyMSBAQCB2b2lk
IGludGVsX2xyX2NvbnRleHRfZnJlZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQo+ICAgewo+
ICAgCWludCBpOwo+Cj4gLQlmb3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fUklOR1M7IGkrKykgewo+
ICsJZm9yIChpID0gSTkxNV9OVU1fUklOR1M7IC0taSA+PSAwOyApIHsKPiArCQlzdHJ1Y3QgaW50
ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW2ldLnJpbmdidWY7Cj4gICAJCXN0
cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbaV0uc3RhdGU7
Cj4KPiAtCQlpZiAoY3R4X29iaikgewo+IC0JCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu
Z2J1ZiA9Cj4gLQkJCQkJY3R4LT5lbmdpbmVbaV0ucmluZ2J1ZjsKPiAtCQkJc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7Cj4gKwkJaWYgKCFjdHhfb2JqKQo+ICsJ
CQljb250aW51ZTsKPgo+IC0JCQlpZiAoY3R4ID09IGN0eC0+aTkxNS0+a2VybmVsX2NvbnRleHQp
IHsKPiAtCQkJCWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOwo+IC0JCQkJaTkx
NV9nZW1fb2JqZWN0X2dndHRfdW5waW4oY3R4X29iaik7Cj4gLQkJCX0KPiAtCQkJV0FSTl9PTihj
dHgtPmVuZ2luZVtyaW5nLT5pZF0ucGluX2NvdW50KTsKPiAtCQkJaW50ZWxfcmluZ2J1ZmZlcl9m
cmVlKHJpbmdidWYpOwo+IC0JCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmY3R4X29iai0+
YmFzZSk7Cj4gKwkJaWYgKGN0eCA9PSBjdHgtPmk5MTUtPmtlcm5lbF9jb250ZXh0KSB7Cj4gKwkJ
CWludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOwo+ICsJCQlpOTE1X2dlbV9vYmpl
Y3RfZ2d0dF91bnBpbihjdHhfb2JqKTsKPiAgIAkJfQo+ICsKPiArCQlXQVJOX09OKGN0eC0+ZW5n
aW5lW2ldLnBpbl9jb3VudCk7Cj4gKwkJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmdidWYpOwo+
ICsJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2JqLT5iYXNlKTsKPiAgIAl9Cj4g
ICB9Cj4KPiBAQCAtMjQ3Miw3ICsyNDY4LDcgQEAgc3RhdGljIHZvaWQgbHJjX3NldHVwX2hhcmR3
YXJlX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCj4gICAgKi8KPgo+
ICAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfYWxsb2Moc3RydWN0IGludGVsX2NvbnRl
eHQgKmN0eCwKPiAtCQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKPiArCQkJ
CSAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQo+ICAgewo+ICAgCXN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7Cj4gICAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg
KmN0eF9vYmo7Cj4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y
ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4
Cg==