From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 23/64] drm/i915: Rename ring->virtual_start as
	ring->vaddr
Date: Thu,  7 Jul 2016 09:41:29 +0100
Message-ID: <1467880930-23082-23-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-x242.google.com (mail-wm0-x242.google.com
 [IPv6:2a00:1450:400c:c09::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 763836E75C
 for <intel-gfx@lists.freedesktop.org>; Thu,  7 Jul 2016 08:42:54 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id 187so3802120wmz.1
 for <intel-gfx@lists.freedesktop.org>; Thu, 07 Jul 2016 01:42:54 -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

SnVzdCBhIGRpZmZlcmVudCBjb2xvdXIgdG8gYmV0dGVyIG1hdGNoIHZpcnR1YWwgYWRkcmVzc2Vz
IGVsc2V3aGVyZS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls
c29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICAgICB8
ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAx
MSArKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwg
IDQgKystLQogMyBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMo
LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBhNjlhNWZjNzViZDYuLmRkZDZiYjZlZjE2
NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0yOTA3LDcgKzI5MDcsNyBAQCBzZW1hcGhv
cmVfd2FpdHNfZm9yKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgdTMyICpzZXFubykK
IAkJaGVhZCAmPSBlbmdpbmUtPmJ1ZmZlci0+c2l6ZSAtIDE7CiAKIAkJLyogVGhpcyBoZXJlIHNl
ZW1zIHRvIGJsb3cgdXAgKi8KLQkJY21kID0gaW9yZWFkMzIoZW5naW5lLT5idWZmZXItPnZpcnR1
YWxfc3RhcnQgKyBoZWFkKTsKKwkJY21kID0gaW9yZWFkMzIoZW5naW5lLT5idWZmZXItPnZhZGRy
ICsgaGVhZCk7CiAJCWlmIChjbWQgPT0gaXBlaHIpCiAJCQlicmVhazsKIApAQCAtMjkxNywxMSAr
MjkxNywxMSBAQCBzZW1hcGhvcmVfd2FpdHNfZm9yKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu
Z2luZSwgdTMyICpzZXFubykKIAlpZiAoIWkpCiAJCXJldHVybiBOVUxMOwogCi0JKnNlcW5vID0g
aW9yZWFkMzIoZW5naW5lLT5idWZmZXItPnZpcnR1YWxfc3RhcnQgKyBoZWFkICsgNCkgKyAxOwor
CSpzZXFubyA9IGlvcmVhZDMyKGVuZ2luZS0+YnVmZmVyLT52YWRkciArIGhlYWQgKyA0KSArIDE7
CiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewotCQlvZmZzZXQgPSBpb3JlYWQzMihl
bmdpbmUtPmJ1ZmZlci0+dmlydHVhbF9zdGFydCArIGhlYWQgKyAxMik7CisJCW9mZnNldCA9IGlv
cmVhZDMyKGVuZ2luZS0+YnVmZmVyLT52YWRkciArIGhlYWQgKyAxMik7CiAJCW9mZnNldCA8PD0g
MzI7Ci0JCW9mZnNldCA9IGlvcmVhZDMyKGVuZ2luZS0+YnVmZmVyLT52aXJ0dWFsX3N0YXJ0ICsg
aGVhZCArIDgpOworCQlvZmZzZXQgPSBpb3JlYWQzMihlbmdpbmUtPmJ1ZmZlci0+dmFkZHIgKyBo
ZWFkICsgOCk7CiAJfQogCXJldHVybiBzZW1hcGhvcmVfd2FpdF90b19zaWduYWxsZXJfcmluZyhl
bmdpbmUsIGlwZWhyLCBvZmZzZXQpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1
ZmZlci5jCmluZGV4IDBkNDA3NTQxNzc4Zi4uMTUxNTdkM2IyMGUzIDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xOTc2LDE0ICsxOTc2LDE0IEBAIHN0YXRpYyBp
bnQgaW5pdF9waHlzX3N0YXR1c19wYWdlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK
IAogdm9pZCBpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl
ciAqcmluZ2J1ZikKIHsKLQlHRU1fQlVHX09OKHJpbmdidWYtPnZtYSA9PSBOVUxMKTsKLQlHRU1f
QlVHX09OKHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPT0gTlVMTCk7CisJR0VNX0JVR19PTighcmlu
Z2J1Zi0+dm1hKTsKKwlHRU1fQlVHX09OKCFyaW5nYnVmLT52YWRkcik7CiAKIAlpZiAoSEFTX0xM
QyhyaW5nYnVmLT5vYmotPmJhc2UuZGV2KSAmJiAhcmluZ2J1Zi0+b2JqLT5zdG9sZW4pCiAJCWk5
MTVfZ2VtX29iamVjdF91bnBpbl9tYXAocmluZ2J1Zi0+b2JqKTsKIAllbHNlCiAJCWk5MTVfdm1h
X3VucGluX2lvbWFwKHJpbmdidWYtPnZtYSk7Ci0JcmluZ2J1Zi0+dmlydHVhbF9zdGFydCA9IE5V
TEw7CisJcmluZ2J1Zi0+dmFkZHIgPSBOVUxMOwogCiAJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5w
aW4ocmluZ2J1Zi0+b2JqKTsKIAlyaW5nYnVmLT52bWEgPSBOVUxMOwpAQCAtMjAzMiw3ICsyMDMy
LDcgQEAgaW50IGludGVsX3Bpbl9hbmRfbWFwX3JpbmdidWZmZXJfb2JqKHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJfQogCX0KIAotCXJpbmdidWYtPnZpcnR1YWxfc3RhcnQg
PSBhZGRyOworCXJpbmdidWYtPnZhZGRyID0gYWRkcjsKIAlyaW5nYnVmLT52bWEgPSBpOTE1X2dl
bV9vYmpfdG9fZ2d0dChvYmopOwogCXJldHVybiAwOwogCkBAIC0yNDA0LDggKzI0MDQsNyBAQCBp
bnQgaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgaW50
IG51bV9kd29yZHMpCiAJCUdFTV9CVUdfT04ocmluZ2J1Zi0+dGFpbCArIHJlbWFpbl9hY3R1YWwg
PiByaW5nYnVmLT5zaXplKTsKIAogCQkvKiBGaWxsIHRoZSB0YWlsIHdpdGggTUlfTk9PUCAqLwot
CQltZW1zZXQocmluZ2J1Zi0+dmlydHVhbF9zdGFydCArIHJpbmdidWYtPnRhaWwsCi0JCSAgICAg
ICAwLCByZW1haW5fYWN0dWFsKTsKKwkJbWVtc2V0KHJpbmdidWYtPnZhZGRyICsgcmluZ2J1Zi0+
dGFpbCwgMCwgcmVtYWluX2FjdHVhbCk7CiAJCXJpbmdidWYtPnRhaWwgPSAwOwogCQlyaW5nYnVm
LT5zcGFjZSAtPSByZW1haW5fYWN0dWFsOwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp
bmdidWZmZXIuaAppbmRleCA3ZjMyZWRiMjkzOTYuLjM0ZDc5YjhmY2I3ZCAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtODQsNyArODQsNyBAQCBzdHJ1Y3QgaW50
ZWxfcmluZ19oYW5nY2hlY2sgewogCiBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciB7CiAJc3RydWN0
IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKLQl2b2lkICp2aXJ0dWFsX3N0YXJ0OworCXZvaWQg
KnZhZGRyOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCiAJc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqZW5naW5lOwpAQCAtNDU2LDcgKzQ1Niw3IEBAIGludCBfX211c3RfY2hlY2sgaW50ZWxfcmlu
Z19jYWNoZWxpbmVfYWxpZ24oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogc3Rh
dGljIGlubGluZSB2b2lkIF9faW50ZWxfcmluZ2J1ZmZlcl9lbWl0KHN0cnVjdCBpbnRlbF9yaW5n
YnVmZmVyICpyYiwKIAkJCQkJICAgdTMyIGRhdGEpCiB7Ci0JKih1aW50MzJfdCAqKShyYi0+dmly
dHVhbF9zdGFydCArIHJiLT50YWlsKSA9IGRhdGE7CisJKih1aW50MzJfdCAqKShyYi0+dmFkZHIg
KyByYi0+dGFpbCkgPSBkYXRhOwogCXJiLT50YWlsICs9IDQ7CiB9CiAKLS0gCjIuOC4xCgpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp
bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m
cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK