From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel@ffwll.ch>
Subject: Re: [PATCH v3 3/3] drm/i915: tidy up a few leftovers
Date: Tue, 12 Jan 2016 14:53:01 +0100
Message-ID: <20160112135301.GJ4588@phenom.ffwll.local>
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"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66])
 by gabe.freedesktop.org (Postfix) with ESMTPS id B52FD6E641
 for <intel-gfx@lists.freedesktop.org>; Tue, 12 Jan 2016 05:52:59 -0800 (PST)
Received: by mail-wm0-f66.google.com with SMTP id l65so31451731wmf.3
 for <intel-gfx@lists.freedesktop.org>; Tue, 12 Jan 2016 05:52:59 -0800 (PST)
Content-Disposition: inline
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>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

T24gVGh1LCBKYW4gMDcsIDIwMTYgYXQgMTA6MjA6NTJBTSArMDAwMCwgRGF2ZSBHb3Jkb24gd3Jv
dGU6Cj4gVGhlcmUgYXJlIGEgZmV3IGJpdHMgb2YgY29kZSB3aGljaCB0aGUgdHJhbnNmb3JtYXRp
b25zIGltcGxlbWVudGVkIGJ5Cj4gdGhlIHByZXZpb3VzIHBhdGNoIHJldmVhbCB0byBiZSBzdWJv
cHRpbWFsLCBvbmNlIHRoZSBub3Rpb24gb2YgYSBwZXItCj4gcmluZyBkZWZhdWx0IGNvbnRleHQg
aGFzIGdvbmUgYXdheS4gU28gdGhpcyB0aWRpZXMgdXAgdGhlIGxlZnRvdmVycy4KPiAKPiBJdCBj
b3VsZCBoYXZlIGJlZW4gc3F1YXNoZWQgaW50byB0aGUgcHJldmlvdXMgcGF0Y2gsIGJ1dCB0aGF0
IHdvdWxkIGhhdmUKPiBtYWRlIHRoYXQgcGF0Y2ggbGVzcyBjbGVhcmx5IGEgc2ltcGxlIHRyYW5z
Zm9ybWF0aW9uLiBJbiBwYXJ0aWN1bGFyLCBhbnkKPiBjaGFuZ2Ugd2hpY2ggYWx0ZXJzIHRoZSBj
b2RlIGJsb2NrIHN0cnVjdHVyZSBvciBpbmRlbnRhdGlvbiBoYXMgYmVlbgo+IGRlZmVycmVkIGlu
dG8gdGhpcyBzZXBhcmF0ZSBwYXRjaCwgYmVjYXVzZSBzdWNoIHRoaW5ncyB0ZW5kIHRvIG1ha2Ug
ZGlmZnMKPiBtb3JlIGRpZmZpY3VsdCB0byByZWFkLgo+IAo+IFNpZ25lZC1vZmYtYnk6IERhdmUg
R29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+CgpZZWFoIEkgdGhpbmsgdGhpcyB3YXMg
Z29vZCB0byBiZSBzcGxpdCB1cCwgc2luY2UgSSdtIG5vdCBjb252aW5jZWQgaXQncwphIG5ldCBp
bXByb3ZlbWVudCAoZnJvbSBhIHF1aWNrIGxvb2sgYXQgbGVhc3QpLiBTdGlsbCBwbGVudHkgb2Yg
ZGVmYXVsdApjb250ZXh0IGNoZWNrcyB0aGF0IHNlZW0gc3VwZXJmbHVvdXMgKGUuZy4gbm90IHBp
bm5pbmcgdGhlIGRlZmF1bHQgY29udGV4dAp3aGVuIGdvaW5nIHRocm91Z2ggZXhlY2xpc3Qgc3Vi
bWlzc2lvbiBpcyBpbW8gYSBuZWVkbGVzcyBzcGVjaWFsIGNhc2UgLQpiZXNpZGVzIHRoYXQgd2Ug
cmVhbGx5IHNob3VsZCB1c2UgYWN0aXZlIHRyYWNraW5nKS4KClNvIEknbGwgcmVmcmFpbiBmcm9t
IGFjayBvciBuYWNrIG9uIHRoaXMgb25lLgotRGFuaWVsCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE1ICsrKysrLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICB8ICA2ICsrLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9scmMuYyAgICB8IDM4ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t
LS0tLS0KPiAgMyBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlvbnMo
LSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwo+IGluZGV4IDI2MTM3MDguLmJi
YjIzZGEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMK
PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwo+IEBAIC0xOTQyLDEx
ICsxOTQyLDggQEAgc3RhdGljIGludCBpOTE1X2NvbnRleHRfc3RhdHVzKHN0cnVjdCBzZXFfZmls
ZSAqbSwgdm9pZCAqdW51c2VkKQo+ICAKPiAgCQlzZXFfcHV0cyhtLCAiSFcgY29udGV4dCAiKTsK
PiAgCQlkZXNjcmliZV9jdHgobSwgY3R4KTsKPiAtCQlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9w
cml2LCBpKSB7Cj4gLQkJCWlmIChkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQgPT0gY3R4KQo+IC0J
CQkJc2VxX3ByaW50ZihtLCAiKGRlZmF1bHQgY29udGV4dCAlcykgIiwKPiAtCQkJCQkgICByaW5n
LT5uYW1lKTsKPiAtCQl9Cj4gKwkJaWYgKGN0eCA9PSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQp
Cj4gKwkJCXNlcV9wcmludGYobSwgIihrZXJuZWwgY29udGV4dCkgIik7Cj4gIAo+ICAJCWlmIChp
OTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKPiAgCQkJc2VxX3B1dGMobSwgJ1xuJyk7Cj4gQEAgLTIw
MzcsMTMgKzIwMzQsMTEgQEAgc3RhdGljIGludCBpOTE1X2R1bXBfbHJjKHN0cnVjdCBzZXFfZmls
ZSAqbSwgdm9pZCAqdW51c2VkKQo+ICAJaWYgKHJldCkKPiAgCQlyZXR1cm4gcmV0Owo+ICAKPiAt
CWxpc3RfZm9yX2VhY2hfZW50cnkoY3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykg
ewo+IC0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKPiAtCQkJaWYgKGRldl9w
cml2LT5rZXJuZWxfY29udGV4dCAhPSBjdHgpCj4gKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGN0eCwg
JmRldl9wcml2LT5jb250ZXh0X2xpc3QsIGxpbmspCj4gKwkJaWYgKGN0eCAhPSBkZXZfcHJpdi0+
a2VybmVsX2NvbnRleHQpCj4gKwkJCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpCj4g
IAkJCQlpOTE1X2R1bXBfbHJjX29iaihtLCByaW5nLAo+ICAJCQkJCQkgIGN0eC0+ZW5naW5lW2ld
LnN0YXRlKTsKPiAtCQl9Cj4gLQl9Cj4gIAo+ICAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9t
dXRleCk7Cj4gIAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IGluZGV4IDhmMTAxMTIxLi40ZjQ1
ZWIyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiArKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4gQEAgLTI2NzcsMTAgKzI2NzcsOCBA
QCB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfZnJlZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZikKPiAgCQlp
OTE1X2dlbV9yZXF1ZXN0X3JlbW92ZV9mcm9tX2NsaWVudChyZXEpOwo+ICAKPiAgCWlmIChjdHgp
IHsKPiAtCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Cj4gLQkJCWlmIChjdHggIT0gcmVx
LT5pOTE1LT5rZXJuZWxfY29udGV4dCkKPiAtCQkJCWludGVsX2xyX2NvbnRleHRfdW5waW4ocmVx
KTsKPiAtCQl9Cj4gKwkJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cyAmJiBjdHggIT0gcmVxLT5p
OTE1LT5rZXJuZWxfY29udGV4dCkKPiArCQkJaW50ZWxfbHJfY29udGV4dF91bnBpbihyZXEpOwo+
ICAKPiAgCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGN0eCk7Cj4gIAl9Cj4gZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMKPiBpbmRleCBhYWFhNWEzLi44YzRjOWI5IDEwMDY0NAo+IC0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMKPiBAQCAtNjYwLDE2ICs2NjAsMTAgQEAgc3RhdGljIGludCBleGVj
bGlzdHNfbW92ZV90b19ncHUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCj4gIAo+
ICBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKPiAgewo+IC0JaW50IHJldDsKPiArCWludCByZXQg
PSAwOwo+ICAKPiAgCXJlcXVlc3QtPnJpbmdidWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVtyZXF1
ZXN0LT5yaW5nLT5pZF0ucmluZ2J1ZjsKPiAgCj4gLQlpZiAocmVxdWVzdC0+Y3R4ICE9IHJlcXVl
c3QtPmk5MTUtPmtlcm5lbF9jb250ZXh0KSB7Cj4gLQkJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9w
aW4ocmVxdWVzdCk7Cj4gLQkJaWYgKHJldCkKPiAtCQkJcmV0dXJuIHJldDsKPiAtCX0KPiAtCj4g
IAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24pIHsKPiAgCQkvKgo+ICAJCSAqIENoZWNr
IHRoYXQgdGhlIEd1QyBoYXMgc3BhY2UgZm9yIHRoZSByZXF1ZXN0IGJlZm9yZQo+IEBAIC02ODMs
NyArNjc3LDEwIEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMo
c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0Cj4gIAkJCXJldHVybiByZXQ7Cj4g
IAl9Cj4gIAo+IC0JcmV0dXJuIDA7Cj4gKwlpZiAocmVxdWVzdC0+Y3R4ICE9IHJlcXVlc3QtPmk5
MTUtPmtlcm5lbF9jb250ZXh0KQo+ICsJCXJldCA9IGludGVsX2xyX2NvbnRleHRfcGluKHJlcXVl
c3QpOwo+ICsKPiArCXJldHVybiByZXQ7Cj4gIH0KPiAgCj4gIHN0YXRpYyBpbnQgbG9naWNhbF9y
aW5nX3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAo+IEBA
IC0yMzgyLDIyICsyMzc5LDIxIEBAIHZvaWQgaW50ZWxfbHJfY29udGV4dF9mcmVlKHN0cnVjdCBp
bnRlbF9jb250ZXh0ICpjdHgpCj4gIHsKPiAgCWludCBpOwo+ICAKPiAtCWZvciAoaSA9IDA7IGkg
PCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7Cj4gKwlmb3IgKGkgPSBJOTE1X05VTV9SSU5HUzsgLS1p
ID49IDA7ICkgewo+ICsJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gY3R4LT5l
bmdpbmVbaV0ucmluZ2J1ZjsKPiAgCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29i
aiA9IGN0eC0+ZW5naW5lW2ldLnN0YXRlOwo+ICAKPiAtCQlpZiAoY3R4X29iaikgewo+IC0JCQlz
dHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9Cj4gLQkJCQkJY3R4LT5lbmdpbmVbaV0u
cmluZ2J1ZjsKPiAtCQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJp
bmc7Cj4gKwkJaWYgKCFjdHhfb2JqKQo+ICsJCQljb250aW51ZTsKPiAgCj4gLQkJCWlmIChjdHgg
PT0gY3R4LT5pOTE1LT5rZXJuZWxfY29udGV4dCkgewo+IC0JCQkJaW50ZWxfdW5waW5fcmluZ2J1
ZmZlcl9vYmoocmluZ2J1Zik7Cj4gLQkJCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhf
b2JqKTsKPiAtCQkJfQo+IC0JCQlXQVJOX09OKGN0eC0+ZW5naW5lW3JpbmctPmlkXS5waW5fY291
bnQpOwo+IC0JCQlpbnRlbF9yaW5nYnVmZmVyX2ZyZWUocmluZ2J1Zik7Cj4gLQkJCWRybV9nZW1f
b2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2JqLT5iYXNlKTsKPiArCQlpZiAoY3R4ID09IGN0eC0+
aTkxNS0+a2VybmVsX2NvbnRleHQpIHsKPiArCQkJaW50ZWxfdW5waW5fcmluZ2J1ZmZlcl9vYmoo
cmluZ2J1Zik7Cj4gKwkJCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwo+ICAJ
CX0KPiArCj4gKwkJV0FSTl9PTihjdHgtPmVuZ2luZVtpXS5waW5fY291bnQpOwo+ICsJCWludGVs
X3JpbmdidWZmZXJfZnJlZShyaW5nYnVmKTsKPiArCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5j
ZSgmY3R4X29iai0+YmFzZSk7Cj4gIAl9Cj4gIH0KPiAgCj4gQEAgLTI0NzIsNyArMjQ2OCw3IEBA
IHN0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICpyaW5nLAo+ICAgKi8KPiAgCj4gIGludCBpbnRlbF9scl9jb250ZXh0X2RlZmVy
cmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCj4gLQkJCQkgICAgIHN0cnVjdCBp
bnRlbF9lbmdpbmVfY3MgKnJpbmcpCj4gKwkJCQkgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAq
cmluZykKPiAgewo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKPiAgCXN0
cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqOwo+IC0tIAo+IDEuOS4xCj4gCj4gX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZngg
bWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApEYW5p
ZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxv
Zy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=