From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v3 2/2] drm/i915: tidy up a few more references
	to engine[]
Date: Tue, 22 Mar 2016 11:48:20 +0000
Message-ID: <1458647300-30914-2-git-send-email-david.s.gordon@intel.com>
References: <56F0120D.201@intel.com>
 <1458647300-30914-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 544FC6E2B7
 for <intel-gfx@lists.freedesktop.org>; Tue, 22 Mar 2016 11:48:36 +0000 (UTC)
In-Reply-To: <1458647300-30914-1-git-send-email-david.s.gordon@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

Tm93IHRoYXQgd2UgaGF2ZSBhIG5hbWUgZm9yIHRoZSBwcmV2aW91c2x5IGFub255bW91cyBwZXIt
ZW5naW5lIHN0cnVjdHVyZQplbWJlZGRlZCBpbnNpZGUgdGhlIGludGVsX2NvbnRleHQgZm9yIHRo
ZSBiZW5lZml0IG9mIGV4ZWNsaXN0IG1vZGUsIHdlCmNhbiBvcHRpbWlzZSBhIGZldyBtb3JlIHBs
YWNlcyB0aGF0IGFjY2VzcyB0aGlzIGFycmF5IG9mIHN0cnVjdHVyZXMuClRoaXMgbWF5IGltcHJv
dmUgdGhlIGNvbXBpbGVyJ3MgYWJpbGl0eSB0byBhdm9pZCByZWR1bmRhbnQgZGVyZWZlcmVuY2UK
YW5kIGluZGV4IG9wZXJhdGlvbnMuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQu
cy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdm
cy5jICAgICAgICB8IDEzICsrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z3VjX3N1Ym1pc3Npb24uYyB8IDE3ICsrKysrKysrKy0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQs
IDE0IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k
ZWJ1Z2ZzLmMKaW5kZXggY2NkY2EyYy4uY2UzYjVlOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k
ZWJ1Z2ZzLmMKQEAgLTE5NjYsMTYgKzE5NjYsMTMgQEAgc3RhdGljIGludCBpOTE1X2NvbnRleHRf
c3RhdHVzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQlpZiAoaTkxNS5lbmFi
bGVfZXhlY2xpc3RzKSB7CiAJCQlzZXFfcHV0YyhtLCAnXG4nKTsKIAkJCWZvcl9lYWNoX2VuZ2lu
ZShlbmdpbmUsIGRldl9wcml2LCBpKSB7Ci0JCQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg
KmN0eF9vYmogPQotCQkJCQljdHgtPmVuZ2luZVtpXS5zdGF0ZTsKLQkJCQlzdHJ1Y3QgaW50ZWxf
cmluZ2J1ZmZlciAqcmluZ2J1ZiA9Ci0JCQkJCWN0eC0+ZW5naW5lW2ldLnJpbmdidWY7CisJCQkJ
c3RydWN0IGludGVsX2VuZ2luZV9jdHggKmVjdHggPSAmY3R4LT5lbmdpbmVbaV07CiAKIAkJCQlz
ZXFfcHJpbnRmKG0sICIlczogIiwgZW5naW5lLT5uYW1lKTsKLQkJCQlpZiAoY3R4X29iaikKLQkJ
CQkJZGVzY3JpYmVfb2JqKG0sIGN0eF9vYmopOwotCQkJCWlmIChyaW5nYnVmKQotCQkJCQlkZXNj
cmliZV9jdHhfcmluZ2J1ZihtLCByaW5nYnVmKTsKKwkJCQlpZiAoZWN0eC0+c3RhdGUpCisJCQkJ
CWRlc2NyaWJlX29iaihtLCBlY3R4LT5zdGF0ZSk7CisJCQkJaWYgKGVjdHgtPnJpbmdidWYpCisJ
CQkJCWRlc2NyaWJlX2N0eF9yaW5nYnVmKG0sIGVjdHgtPnJpbmdidWYpOwogCQkJCXNlcV9wdXRj
KG0sICdcbicpOwogCQkJfQogCQl9IGVsc2UgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
dWNfc3VibWlzc2lvbi5jCmluZGV4IGFlMWY1OGQuLjczNTIwMjMgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTM5Miw2ICszOTIsNyBAQCBzdGF0aWMg
dm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAKIAlmb3JfZWFj
aF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaSkgewogCQlzdHJ1Y3QgZ3VjX2V4ZWNsaXN0X2Nv
bnRleHQgKmxyYyA9ICZkZXNjLmxyY1tlbmdpbmUtPmd1Y19pZF07CisJCXN0cnVjdCBpbnRlbF9l
bmdpbmVfY3R4ICplY3R4ID0gJmN0eC0+ZW5naW5lW2ldOwogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X29iamVjdCAqb2JqOwogCQl1aW50NjRfdCBjdHhfZGVzYzsKIApAQCAtNDAyLDcgKzQwMyw3IEBA
IHN0YXRpYyB2b2lkIGd1Y19pbml0X2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJ
ICogZm9yIG5vdyB3aG8gb3ducyBhIEd1QyBjbGllbnQuIEJ1dCBmb3IgZnV0dXJlIG93bmVyIG9m
IEd1QwogCQkgKiBjbGllbnQsIG5lZWQgdG8gbWFrZSBzdXJlIGxyYyBpcyBwaW5uZWQgcHJpb3Ig
dG8gZW50ZXIgaGVyZS4KIAkJICovCi0JCW9iaiA9IGN0eC0+ZW5naW5lW2ldLnN0YXRlOworCQlv
YmogPSBlY3R4LT5zdGF0ZTsKIAkJaWYgKCFvYmopCiAJCQlicmVhazsJLyogWFhYOiBjb250aW51
ZT8gKi8KIApAQCAtNDE1LDcgKzQxNiw3IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X2N0eF9kZXNj
KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJbHJjLT5jb250ZXh0X2lkID0gKGNsaWVudC0+Y3R4
X2luZGV4IDw8IEdVQ19FTENfQ1RYSURfT0ZGU0VUKSB8CiAJCQkJKGVuZ2luZS0+Z3VjX2lkIDw8
IEdVQ19FTENfRU5HSU5FX09GRlNFVCk7CiAKLQkJb2JqID0gY3R4LT5lbmdpbmVbaV0ucmluZ2J1
Zi0+b2JqOworCQlvYmogPSBlY3R4LT5yaW5nYnVmLT5vYmo7CiAKIAkJbHJjLT5yaW5nX2JlZ2lu
ID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaik7CiAJCWxyYy0+cmluZ19lbmQgPSBscmMt
PnJpbmdfYmVnaW4gKyBvYmotPmJhc2Uuc2l6ZSAtIDE7CkBAIC05ODcsMTkgKzk4OCwxOSBAQCBp
bnQgaW50ZWxfZ3VjX3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBp
bnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwotCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpj
dHg7CisJc3RydWN0IGludGVsX2VuZ2luZV9jdHggKmVjdHg7CiAJdTMyIGRhdGFbM107CiAKIAlp
ZiAoIWk5MTUuZW5hYmxlX2d1Y19zdWJtaXNzaW9uKQogCQlyZXR1cm4gMDsKIAotCWN0eCA9IGRl
dl9wcml2LT5rZXJuZWxfY29udGV4dDsKKwllY3R4ID0gJmRldl9wcml2LT5rZXJuZWxfY29udGV4
dC0+ZW5naW5lW1JDU107CiAKIAlkYXRhWzBdID0gSE9TVDJHVUNfQUNUSU9OX0VOVEVSX1NfU1RB
VEU7CiAJLyogYW55IHZhbHVlIGdyZWF0ZXIgdGhhbiBHVUNfUE9XRVJfRDAgKi8KIAlkYXRhWzFd
ID0gR1VDX1BPV0VSX0QxOwogCS8qIGZpcnN0IHBhZ2UgaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMg
Ki8KLQlkYXRhWzJdID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGN0eC0+ZW5naW5lW1JDU10u
c3RhdGUpOworCWRhdGFbMl0gPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoZWN0eC0+c3RhdGUp
OwogCiAJcmV0dXJuIGhvc3QyZ3VjX2FjdGlvbihndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkp
OwogfQpAQCAtMTAxMywxOCArMTAxNCwxOCBAQCBpbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3Qg
ZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9
IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5n
dWM7Ci0Jc3RydWN0IGludGVsX2NvbnRleHQgKmN0eDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2N0
eCAqZWN0eDsKIAl1MzIgZGF0YVszXTsKIAogCWlmICghaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Np
b24pCiAJCXJldHVybiAwOwogCi0JY3R4ID0gZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0OworOwll
Y3R4ID0gJmRldl9wcml2LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW1JDU107CiAKIAlkYXRhWzBd
ID0gSE9TVDJHVUNfQUNUSU9OX0VYSVRfU19TVEFURTsKIAlkYXRhWzFdID0gR1VDX1BPV0VSX0Qw
OwogCS8qIGZpcnN0IHBhZ2UgaXMgc2hhcmVkIGRhdGEgd2l0aCBHdUMgKi8KLQlkYXRhWzJdID0g
aTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGN0eC0+ZW5naW5lW1JDU10uc3RhdGUpOworCWRhdGFb
Ml0gPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoZWN0eC0+c3RhdGUpOwogCiAJcmV0dXJuIGhv
c3QyZ3VjX2FjdGlvbihndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwogfQotLSAKMS45LjEK
Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm
eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp
c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=