From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 28/64] drm/i915: Rename
	intel_context[engine].ringbuf
Date: Thu,  7 Jul 2016 09:41:34 +0100
Message-ID: <1467880930-23082-28-git-send-email-chris@chris-wilson.co.uk>
References: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk>
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 750D46E756
 for <intel-gfx@lists.freedesktop.org>; Thu,  7 Jul 2016 08:43:00 +0000 (UTC)
Received: by mail-wm0-x241.google.com with SMTP id n127so1265872wme.0
 for <intel-gfx@lists.freedesktop.org>; Thu, 07 Jul 2016 01:43:00 -0700 (PDT)
In-Reply-To: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk>
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

UGVyZm9ybSBzL3JpbmdidWYvcmluZy8gb24gdGhlIGNvbnRleHQgc3RydWN0IGZvciBjb25zaXN0
ZW5jeSB3aXRoIHRoZQpyaW5nL2VuZ2luZSBzcGxpdC4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdp
bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZGVidWdmcy5jICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW1fY29udGV4dC5jICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
dWNfc3VibWlzc2lvbi5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j
ICAgICAgICAgICB8IDMzICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogNSBmaWxlcyBj
aGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZGVidWdmcy5jCmluZGV4IDcyOTUwYjliM2U5Yy4uZWJjOWQxMGM2ZWM0IDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtNDI1LDggKzQyNSw4IEBAIHN0YXRpYyBpbnQg
cGVyX2ZpbGVfY3R4X3N0YXRzKGludCBpZCwgdm9pZCAqcHRyLCB2b2lkICpkYXRhKQogCWZvciAo
biA9IDA7IG4gPCBBUlJBWV9TSVpFKGN0eC0+ZW5naW5lKTsgbisrKSB7CiAJCWlmIChjdHgtPmVu
Z2luZVtuXS5zdGF0ZSkKIAkJCXBlcl9maWxlX3N0YXRzKDAsIGN0eC0+ZW5naW5lW25dLnN0YXRl
LCBkYXRhKTsKLQkJaWYgKGN0eC0+ZW5naW5lW25dLnJpbmdidWYpCi0JCQlwZXJfZmlsZV9zdGF0
cygwLCBjdHgtPmVuZ2luZVtuXS5yaW5nYnVmLT5vYmosIGRhdGEpOworCQlpZiAoY3R4LT5lbmdp
bmVbbl0ucmluZykKKwkJCXBlcl9maWxlX3N0YXRzKDAsIGN0eC0+ZW5naW5lW25dLnJpbmctPm9i
aiwgZGF0YSk7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC0yMDY0LDggKzIwNjQsOCBAQCBzdGF0aWMg
aW50IGk5MTVfY29udGV4dF9zdGF0dXMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQp
CiAJCQlzZXFfcHV0YyhtLCBjZS0+aW5pdGlhbGlzZWQgPyAnSScgOiAnaScpOwogCQkJaWYgKGNl
LT5zdGF0ZSkKIAkJCQlkZXNjcmliZV9vYmoobSwgY2UtPnN0YXRlKTsKLQkJCWlmIChjZS0+cmlu
Z2J1ZikKLQkJCQlkZXNjcmliZV9jdHhfcmluZ2J1ZihtLCBjZS0+cmluZ2J1Zik7CisJCQlpZiAo
Y2UtPnJpbmcpCisJCQkJZGVzY3JpYmVfY3R4X3JpbmdidWYobSwgY2UtPnJpbmcpOwogCQkJc2Vx
X3B1dGMobSwgJ1xuJyk7CiAJCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMDk5MWU1
OWE1ZDM3Li40NzcwNzRjNGE5Y2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtODkxLDcg
Kzg5MSw3IEBAIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0IHsKIAogCXN0cnVjdCBpbnRlbF9jb250
ZXh0IHsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKnN0YXRlOwotCQlzdHJ1Y3QgaW50
ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZjsKKwkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmc7
CiAJCXN0cnVjdCBpOTE1X3ZtYSAqbHJjX3ZtYTsKIAkJdWludDMyX3QgKmxyY19yZWdfc3RhdGU7
CiAJCXU2NCBscmNfZGVzYzsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpp
bmRleCAyNzFhZWJhNmYzZTUuLjc5ZTQwOWEzZDJkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtX2NvbnRleHQuYwpAQCAtMTczLDggKzE3Myw4IEBAIHZvaWQgaTkxNV9nZW1fY29udGV4
dF9mcmVlKHN0cnVjdCBrcmVmICpjdHhfcmVmKQogCQkJY29udGludWU7CiAKIAkJV0FSTl9PTihj
ZS0+cGluX2NvdW50KTsKLQkJaWYgKGNlLT5yaW5nYnVmKQotCQkJaW50ZWxfcmluZ2J1ZmZlcl9m
cmVlKGNlLT5yaW5nYnVmKTsKKwkJaWYgKGNlLT5yaW5nKQorCQkJaW50ZWxfcmluZ2J1ZmZlcl9m
cmVlKGNlLT5yaW5nKTsKIAogCQlpOTE1X2dlbV9vYmplY3RfcHV0KGNlLT5zdGF0ZSk7CiAJfQpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDAxYzFjMTY3
MTgxMS4uZWNjZDM0ODMyZmU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi
bWlzc2lvbi5jCkBAIC0zNjMsNyArMzYzLDcgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfY3R4X2Rl
c2Moc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQlscmMtPmNvbnRleHRfaWQgPSAoY2xpZW50LT5j
dHhfaW5kZXggPDwgR1VDX0VMQ19DVFhJRF9PRkZTRVQpIHwKIAkJCQkoZW5naW5lLT5ndWNfaWQg
PDwgR1VDX0VMQ19FTkdJTkVfT0ZGU0VUKTsKIAotCQlvYmogPSBjZS0+cmluZ2J1Zi0+b2JqOwor
CQlvYmogPSBjZS0+cmluZy0+b2JqOwogCQlnZnhfYWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0X29m
ZnNldChvYmopOwogCiAJCWxyYy0+cmluZ19iZWdpbiA9IGdmeF9hZGRyOwpkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9scmMuYwppbmRleCA5MTEyM2VhZGEwMDAuLjI0NzNjMmNiZDFhNSAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfbHJjLmMKQEAgLTQ4MiwxMSArNDgyLDggQEAgc3RhdGljIHZvaWQgZXhlY2xpc3Rz
X2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCSAqIHJl
c3VibWl0IHRoZSByZXF1ZXN0LiBTZWUgZ2VuOF9lbWl0X3JlcXVlc3QoKSBmb3Igd2hlcmUgd2UK
IAkJICogcHJlcGFyZSB0aGUgcGFkZGluZyBhZnRlciB0aGUgZW5kIG9mIHRoZSByZXF1ZXN0Lgog
CQkgKi8KLQkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7Ci0KLQkJcmluZ2J1ZiA9
IHJlcTAtPmN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWY7CiAJCXJlcTAtPnRhaWwgKz0g
ODsKLQkJcmVxMC0+dGFpbCAmPSByaW5nYnVmLT5zaXplIC0gMTsKKwkJcmVxMC0+dGFpbCAmPSBy
ZXEwLT5yaW5nLT5zaXplIC0gMTsKIAl9CiAKIAlleGVjbGlzdHNfc3VibWl0X3JlcXVlc3RzKHJl
cTAsIHJlcTEpOwpAQCAtNzE3LDcgKzcxNCw3IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxs
b2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0CiAJ
CQlyZXR1cm4gcmV0OwogCX0KIAotCXJlcXVlc3QtPnJpbmcgPSBjZS0+cmluZ2J1ZjsKKwlyZXF1
ZXN0LT5yaW5nID0gY2UtPnJpbmc7CiAKIAlpZiAoaTkxNS5lbmFibGVfZ3VjX3N1Ym1pc3Npb24p
IHsKIAkJLyoKQEAgLTk3OSwxNCArOTc2LDE0IEBAIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29udGV4
dF9waW4oc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKIAogCWxyY19yZWdfc3RhdGUgPSB2
YWRkciArIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKIAotCXJldCA9IGludGVsX3Bpbl9hbmRf
bWFwX3JpbmdidWZmZXJfb2JqKGRldl9wcml2LCBjZS0+cmluZ2J1Zik7CisJcmV0ID0gaW50ZWxf
cGluX2FuZF9tYXBfcmluZ2J1ZmZlcl9vYmooZGV2X3ByaXYsIGNlLT5yaW5nKTsKIAlpZiAocmV0
KQogCQlnb3RvIHVucGluX21hcDsKIAogCWNlLT5scmNfdm1hID0gaTkxNV9nZW1fb2JqX3RvX2dn
dHQoY2UtPnN0YXRlKTsKIAlpbnRlbF9scl9jb250ZXh0X2Rlc2NyaXB0b3JfdXBkYXRlKGN0eCwg
ZW5naW5lKTsKIAotCWxyY19yZWdfc3RhdGVbQ1RYX1JJTkdfQlVGRkVSX1NUQVJUKzFdID0gY2Ut
PnJpbmdidWYtPnZtYS0+bm9kZS5zdGFydDsKKwlscmNfcmVnX3N0YXRlW0NUWF9SSU5HX0JVRkZF
Ul9TVEFSVCsxXSA9IGNlLT5yaW5nLT52bWEtPm5vZGUuc3RhcnQ7CiAJY2UtPmxyY19yZWdfc3Rh
dGUgPSBscmNfcmVnX3N0YXRlOwogCWNlLT5zdGF0ZS0+ZGlydHkgPSB0cnVlOwogCkBAIC0xMDE3
LDcgKzEwMTQsNyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0IGk5MTVfZ2Vt
X2NvbnRleHQgKmN0eCwKIAlpZiAoLS1jZS0+cGluX2NvdW50KQogCQlyZXR1cm47CiAKLQlpbnRl
bF91bnBpbl9yaW5nYnVmZmVyX29iaihjZS0+cmluZ2J1Zik7CisJaW50ZWxfdW5waW5fcmluZ2J1
ZmZlcl9vYmooY2UtPnJpbmcpOwogCiAJaTkxNV9nZW1fb2JqZWN0X3VucGluX21hcChjZS0+c3Rh
dGUpOwogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKGNlLT5zdGF0ZSk7CkBAIC0yNDcwLDcg
KzI0NjcsNyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0
cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg
KmN0eF9vYmo7CiAJc3RydWN0IGludGVsX2NvbnRleHQgKmNlID0gJmN0eC0+ZW5naW5lW2VuZ2lu
ZS0+aWRdOwogCXVpbnQzMl90IGNvbnRleHRfc2l6ZTsKLQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl
ciAqcmluZ2J1ZjsKKwlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZzsKIAlpbnQgcmV0Owog
CiAJV0FSTl9PTihjZS0+c3RhdGUpOwpAQCAtMjQ4NiwyOSArMjQ4MywyOSBAQCBzdGF0aWMgaW50
IGV4ZWNsaXN0c19jb250ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0
ICpjdHgsCiAJCXJldHVybiBQVFJfRVJSKGN0eF9vYmopOwogCX0KIAotCXJpbmdidWYgPSBpbnRl
bF9lbmdpbmVfY3JlYXRlX3JpbmdidWZmZXIoZW5naW5lLCBjdHgtPnJpbmdfc2l6ZSk7Ci0JaWYg
KElTX0VSUihyaW5nYnVmKSkgewotCQlyZXQgPSBQVFJfRVJSKHJpbmdidWYpOworCXJpbmcgPSBp
bnRlbF9lbmdpbmVfY3JlYXRlX3JpbmdidWZmZXIoZW5naW5lLCBjdHgtPnJpbmdfc2l6ZSk7CisJ
aWYgKElTX0VSUihyaW5nKSkgeworCQlyZXQgPSBQVFJfRVJSKHJpbmcpOwogCQlnb3RvIGVycm9y
X2RlcmVmX29iajsKIAl9CiAKLQlyZXQgPSBwb3B1bGF0ZV9scl9jb250ZXh0KGN0eCwgY3R4X29i
aiwgZW5naW5lLCByaW5nYnVmKTsKKwlyZXQgPSBwb3B1bGF0ZV9scl9jb250ZXh0KGN0eCwgY3R4
X29iaiwgZW5naW5lLCByaW5nKTsKIAlpZiAocmV0KSB7CiAJCURSTV9ERUJVR19EUklWRVIoIkZh
aWxlZCB0byBwb3B1bGF0ZSBMUkM6ICVkXG4iLCByZXQpOwogCQlnb3RvIGVycm9yX3JpbmdidWY7
CiAJfQogCi0JY2UtPnJpbmdidWYgPSByaW5nYnVmOworCWNlLT5yaW5nID0gcmluZzsKIAljZS0+
c3RhdGUgPSBjdHhfb2JqOwogCWNlLT5pbml0aWFsaXNlZCA9IGVuZ2luZS0+aW5pdF9jb250ZXh0
ID09IE5VTEw7CiAKIAlyZXR1cm4gMDsKIAogZXJyb3JfcmluZ2J1ZjoKLQlpbnRlbF9yaW5nYnVm
ZmVyX2ZyZWUocmluZ2J1Zik7CisJaW50ZWxfcmluZ2J1ZmZlcl9mcmVlKHJpbmcpOwogZXJyb3Jf
ZGVyZWZfb2JqOgogCWk5MTVfZ2VtX29iamVjdF9wdXQoY3R4X29iaik7Ci0JY2UtPnJpbmdidWYg
PSBOVUxMOworCWNlLT5yaW5nID0gTlVMTDsKIAljZS0+c3RhdGUgPSBOVUxMOwogCXJldHVybiBy
ZXQ7CiB9CkBAIC0yNTM5LDcgKzI1MzYsNyBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfcmVzZXQo
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiAJCWk5MTVfZ2VtX29iamVjdF91
bnBpbl9tYXAoY3R4X29iaik7CiAKLQkJY2UtPnJpbmdidWYtPmhlYWQgPSAwOwotCQljZS0+cmlu
Z2J1Zi0+dGFpbCA9IDA7CisJCWNlLT5yaW5nLT5oZWFkID0gMDsKKwkJY2UtPnJpbmctPnRhaWwg
PSAwOwogCX0KIH0KLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl
ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9pbnRlbC1nZngK