From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 23/62] drm/i915: Rename ring->virtual_start as
	ring->vaddr
Date: Fri,  3 Jun 2016 17:36:48 +0100
Message-ID: <1464971847-15809-24-git-send-email-chris@chris-wilson.co.uk>
References: <1464971847-15809-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-x244.google.com (mail-wm0-x244.google.com
 [IPv6:2a00:1450:400c:c09::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 324F56EE36
 for <intel-gfx@lists.freedesktop.org>; Fri,  3 Jun 2016 16:37:58 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id a136so630106wme.0
 for <intel-gfx@lists.freedesktop.org>; Fri, 03 Jun 2016 09:37:58 -0700 (PDT)
In-Reply-To: <1464971847-15809-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
IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDkg
KysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCA0ICsr
LS0KIDMgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggODYwMjM1ZDFlMGJmLi40MjE0OTE1MzUxMGUgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjkwNiw3ICsyOTA2LDcgQEAgc2VtYXBob3JlX3dh
aXRzX2ZvcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIHUzMiAqc2Vxbm8pCiAJCWhl
YWQgJj0gZW5naW5lLT5idWZmZXItPnNpemUgLSAxOwogCiAJCS8qIFRoaXMgaGVyZSBzZWVtcyB0
byBibG93IHVwICovCi0JCWNtZCA9IGlvcmVhZDMyKGVuZ2luZS0+YnVmZmVyLT52aXJ0dWFsX3N0
YXJ0ICsgaGVhZCk7CisJCWNtZCA9IGlvcmVhZDMyKGVuZ2luZS0+YnVmZmVyLT52YWRkciArIGhl
YWQpOwogCQlpZiAoY21kID09IGlwZWhyKQogCQkJYnJlYWs7CiAKQEAgLTI5MTYsMTEgKzI5MTYs
MTEgQEAgc2VtYXBob3JlX3dhaXRzX2ZvcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUs
IHUzMiAqc2Vxbm8pCiAJaWYgKCFpKQogCQlyZXR1cm4gTlVMTDsKIAotCSpzZXFubyA9IGlvcmVh
ZDMyKGVuZ2luZS0+YnVmZmVyLT52aXJ0dWFsX3N0YXJ0ICsgaGVhZCArIDQpICsgMTsKKwkqc2Vx
bm8gPSBpb3JlYWQzMihlbmdpbmUtPmJ1ZmZlci0+dmFkZHIgKyBoZWFkICsgNCkgKyAxOwogCWlm
IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKLQkJb2Zmc2V0ID0gaW9yZWFkMzIoZW5naW5l
LT5idWZmZXItPnZpcnR1YWxfc3RhcnQgKyBoZWFkICsgMTIpOworCQlvZmZzZXQgPSBpb3JlYWQz
MihlbmdpbmUtPmJ1ZmZlci0+dmFkZHIgKyBoZWFkICsgMTIpOwogCQlvZmZzZXQgPDw9IDMyOwot
CQlvZmZzZXQgPSBpb3JlYWQzMihlbmdpbmUtPmJ1ZmZlci0+dmlydHVhbF9zdGFydCArIGhlYWQg
KyA4KTsKKwkJb2Zmc2V0ID0gaW9yZWFkMzIoZW5naW5lLT5idWZmZXItPnZhZGRyICsgaGVhZCAr
IDgpOwogCX0KIAlyZXR1cm4gc2VtYXBob3JlX3dhaXRfdG9fc2lnbmFsbGVyX3JpbmcoZW5naW5l
LCBpcGVociwgb2Zmc2V0KTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu
YwppbmRleCA3MWRkZjFkZmVhNzYuLjc1YjZkNmVlZTBhYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTg5MiwxMyArMTg5MiwxMyBAQCBzdGF0aWMgaW50IGlu
aXRfcGh5c19zdGF0dXNfcGFnZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB2b2lk
IGludGVsX3VucGluX3JpbmdidWZmZXJfb2JqKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n
YnVmKQogewogCUdFTV9CVUdfT04ocmluZ2J1Zi0+dm1hID09IE5VTEwpOwotCUdFTV9CVUdfT04o
cmluZ2J1Zi0+dmlydHVhbF9zdGFydCA9PSBOVUxMKTsKKwlHRU1fQlVHX09OKHJpbmdidWYtPnZh
ZGRyID09IE5VTEwpOwogCiAJaWYgKEhBU19MTEMocmluZ2J1Zi0+b2JqLT5iYXNlLmRldikgJiYg
IXJpbmdidWYtPm9iai0+c3RvbGVuKQogCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKHJpbmdi
dWYtPm9iaik7CiAJZWxzZQogCQlpOTE1X3ZtYV91bnBpbl9pb21hcChyaW5nYnVmLT52bWEpOwot
CXJpbmdidWYtPnZpcnR1YWxfc3RhcnQgPSBOVUxMOworCXJpbmdidWYtPnZhZGRyID0gTlVMTDsK
IAogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHJpbmdidWYtPm9iaik7CiAJcmluZ2J1Zi0+
dm1hID0gTlVMTDsKQEAgLTE5NDcsNyArMTk0Nyw3IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9y
aW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCX0KIAl9
CiAKLQlyaW5nYnVmLT52aXJ0dWFsX3N0YXJ0ID0gYWRkcjsKKwlyaW5nYnVmLT52YWRkciA9IGFk
ZHI7CiAJcmluZ2J1Zi0+dm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQob2JqKTsKIAlyZXR1cm4g
MDsKIApAQCAtMjMxNyw4ICsyMzE3LDcgQEAgaW50IGludGVsX3JpbmdfYmVnaW4oc3RydWN0IGRy
bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIGludCBudW1fZHdvcmRzKQogCQlHRU1fQlVHX09OKHJp
bmdidWYtPnRhaWwgKyByZW1haW5fYWN0dWFsID4gcmluZ2J1Zi0+c2l6ZSk7CiAKIAkJLyogRmls
bCB0aGUgdGFpbCB3aXRoIE1JX05PT1AgKi8KLQkJbWVtc2V0KHJpbmdidWYtPnZpcnR1YWxfc3Rh
cnQgKyByaW5nYnVmLT50YWlsLAotCQkgICAgICAgMCwgcmVtYWluX2FjdHVhbCk7CisJCW1lbXNl
dChyaW5nYnVmLT52YWRkciArIHJpbmdidWYtPnRhaWwsIDAsIHJlbWFpbl9hY3R1YWwpOwogCQly
aW5nYnVmLT50YWlsID0gMDsKIAkJcmluZ2J1Zi0+c3BhY2UgLT0gcmVtYWluX2FjdHVhbDsKIAl9
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNWRiN2RiMDY5NTY2
Li4zY2JjZGQ1NzUxYWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp
bmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK
QEAgLTk2LDcgKzk2LDcgQEAgc3RydWN0IGludGVsX3JpbmdfaGFuZ2NoZWNrIHsKIAogc3RydWN0
IGludGVsX3JpbmdidWZmZXIgewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7Ci0J
dm9pZCAqdmlydHVhbF9zdGFydDsKKwl2b2lkICp2YWRkcjsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZt
YTsKIAogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKQEAgLTQ2NSw3ICs0NjUsNyBA
QCBpbnQgX19tdXN0X2NoZWNrIGludGVsX3JpbmdfY2FjaGVsaW5lX2FsaWduKHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIHN0YXRpYyBpbmxpbmUgdm9pZCBfX2ludGVsX3Jpbmdi
dWZmZXJfZW1pdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmIsCiAJCQkJCSAgIHUzMiBkYXRh
KQogewotCSoodWludDMyX3QgKikocmItPnZpcnR1YWxfc3RhcnQgKyByYi0+dGFpbCkgPSBkYXRh
OworCSoodWludDMyX3QgKikocmItPnZhZGRyICsgcmItPnRhaWwpID0gZGF0YTsKIAlyYi0+dGFp
bCArPSA0OwogfQogc3RhdGljIGlubGluZSB2b2lkIF9faW50ZWxfcmluZ2J1ZmZlcl9hZHZhbmNl
KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyYikKLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v
cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK