From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 31/62] drm/i915: Rename residual ringbuf
	parameters
Date: Fri,  3 Jun 2016 17:36:56 +0100
Message-ID: <1464971847-15809-32-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-x242.google.com (mail-wm0-x242.google.com
 [IPv6:2a00:1450:400c:c09::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 93E8B6EE30
 for <intel-gfx@lists.freedesktop.org>; Fri,  3 Jun 2016 16:38:05 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id a136so630771wme.0
 for <intel-gfx@lists.freedesktop.org>; Fri, 03 Jun 2016 09:38:05 -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

Tm93IHRoYXQgd2UgaGF2ZSBhIGNsZWFyIHJpbmcvZW5naW5lIHNwbGl0IGFuZCBhIHN0cnVjdCBp
bnRlbF9yaW5nLCB3ZQpubyBsb25nZXIgbmVlZCB0aGUgc3RvcGdhcCByaW5nYnVmIG5hbWVzLgoK
U2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0t
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNjYgKysrKysrKysr
KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n
YnVmZmVyLmggfCAgNiArLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMzYg
ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu
Z2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4
IDk0MjcxMWNkNTQ5NS4uZDY0MzY5OGRhODMwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cmluZ2J1ZmZlci5jCkBAIC00NywxNSArNDcsMTUgQEAgaW50IF9faW50ZWxfcmluZ19zcGFjZShp
bnQgaGVhZCwgaW50IHRhaWwsIGludCBzaXplKQogCXJldHVybiBzcGFjZSAtIEk5MTVfUklOR19G
UkVFX1NQQUNFOwogfQogCi12b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBpbnRl
bF9yaW5nICpyaW5nYnVmKQordm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50
ZWxfcmluZyAqcmluZykKIHsKLQlpZiAocmluZ2J1Zi0+bGFzdF9yZXRpcmVkX2hlYWQgIT0gLTEp
IHsKLQkJcmluZ2J1Zi0+aGVhZCA9IHJpbmdidWYtPmxhc3RfcmV0aXJlZF9oZWFkOwotCQlyaW5n
YnVmLT5sYXN0X3JldGlyZWRfaGVhZCA9IC0xOworCWlmIChyaW5nLT5sYXN0X3JldGlyZWRfaGVh
ZCAhPSAtMSkgeworCQlyaW5nLT5oZWFkID0gcmluZy0+bGFzdF9yZXRpcmVkX2hlYWQ7CisJCXJp
bmctPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7CiAJfQogCi0JcmluZ2J1Zi0+c3BhY2UgPSBfX2lu
dGVsX3Jpbmdfc3BhY2UocmluZ2J1Zi0+aGVhZCAmIEhFQURfQUREUiwKLQkJCQkJICAgIHJpbmdi
dWYtPnRhaWwsIHJpbmdidWYtPnNpemUpOworCXJpbmctPnNwYWNlID0gX19pbnRlbF9yaW5nX3Nw
YWNlKHJpbmctPmhlYWQgJiBIRUFEX0FERFIsCisJCQkJCSByaW5nLT50YWlsLCByaW5nLT5zaXpl
KTsKIH0KIAogc3RhdGljIHZvaWQgX19pbnRlbF9lbmdpbmVfc3VibWl0KHN0cnVjdCBpbnRlbF9l
bmdpbmVfY3MgKmVuZ2luZSkKQEAgLTE4OTQsMjUgKzE4OTQsMjUgQEAgc3RhdGljIGludCBpbml0
X3BoeXNfc3RhdHVzX3BhZ2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVy
biAwOwogfQogCi12b2lkIGludGVsX3VucGluX3Jpbmcoc3RydWN0IGludGVsX3JpbmcgKnJpbmdi
dWYpCit2b2lkIGludGVsX3VucGluX3Jpbmcoc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiB7Ci0J
R0VNX0JVR19PTihyaW5nYnVmLT52bWEgPT0gTlVMTCk7Ci0JR0VNX0JVR19PTihyaW5nYnVmLT52
YWRkciA9PSBOVUxMKTsKKwlHRU1fQlVHX09OKHJpbmctPnZtYSA9PSBOVUxMKTsKKwlHRU1fQlVH
X09OKHJpbmctPnZhZGRyID09IE5VTEwpOwogCi0JaWYgKEhBU19MTEMocmluZ2J1Zi0+b2JqLT5i
YXNlLmRldikgJiYgIXJpbmdidWYtPm9iai0+c3RvbGVuKQotCQlpOTE1X2dlbV9vYmplY3RfdW5w
aW5fbWFwKHJpbmdidWYtPm9iaik7CisJaWYgKEhBU19MTEMocmluZy0+b2JqLT5iYXNlLmRldikg
JiYgIXJpbmctPm9iai0+c3RvbGVuKQorCQlpOTE1X2dlbV9vYmplY3RfdW5waW5fbWFwKHJpbmct
Pm9iaik7CiAJZWxzZQotCQlpOTE1X3ZtYV91bnBpbl9pb21hcChyaW5nYnVmLT52bWEpOwotCXJp
bmdidWYtPnZhZGRyID0gTlVMTDsKKwkJaTkxNV92bWFfdW5waW5faW9tYXAocmluZy0+dm1hKTsK
KwlyaW5nLT52YWRkciA9IE5VTEw7CiAKLQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihyaW5n
YnVmLT5vYmopOwotCXJpbmdidWYtPnZtYSA9IE5VTEw7CisJaTkxNV9nZW1fb2JqZWN0X2dndHRf
dW5waW4ocmluZy0+b2JqKTsKKwlyaW5nLT52bWEgPSBOVUxMOwogfQogCiBpbnQgaW50ZWxfcGlu
X2FuZF9tYXBfcmluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICBz
dHJ1Y3QgaW50ZWxfcmluZyAqcmluZ2J1ZikKKwkJCSAgIHN0cnVjdCBpbnRlbF9yaW5nICpyaW5n
KQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSByaW5nYnVmLT5vYmo7CisJ
c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHJpbmctPm9iajsKIAkvKiBSaW5nIHdy
YXBhcm91bmQgYXQgb2Zmc2V0IDAgc29tZXRpbWVzIGhhbmdzLiBObyBpZGVhIHdoeS4gKi8KIAl1
bnNpZ25lZCBmbGFncyA9IFBJTl9PRkZTRVRfQklBUyB8IDQwOTY7CiAJdm9pZCAqYWRkcjsKQEAg
LTE5NTIsOCArMTk1Miw4IEBAIGludCBpbnRlbF9waW5fYW5kX21hcF9yaW5nKHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJfQogCX0KIAotCXJpbmdidWYtPnZhZGRyID0gYWRk
cjsKLQlyaW5nYnVmLT52bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChvYmopOworCXJpbmctPnZh
ZGRyID0gYWRkcjsKKwlyaW5nLT52bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChvYmopOwogCXJl
dHVybiAwOwogCiBlcnJfdW5waW46CkBAIC0xOTYxLDI5ICsxOTYxLDI5IEBAIGVycl91bnBpbjoK
IAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJf
b2JqKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nYnVmKQorc3RhdGljIHZvaWQgaW50ZWxfZGVzdHJv
eV9yaW5nYnVmZmVyX29iaihzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKIHsKLQlpOTE1X2dlbV9v
YmplY3RfcHV0KHJpbmdidWYtPm9iaik7Ci0JcmluZ2J1Zi0+b2JqID0gTlVMTDsKKwlpOTE1X2dl
bV9vYmplY3RfcHV0KHJpbmctPm9iaik7CisJcmluZy0+b2JqID0gTlVMTDsKIH0KIAogc3RhdGlj
IGludCBpbnRlbF9hbGxvY19yaW5nYnVmZmVyX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAot
CQkJCSAgICAgIHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nYnVmKQorCQkJCSAgICAgIHN0cnVjdCBp
bnRlbF9yaW5nICpyaW5nKQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAK
IAlvYmogPSBOVUxMOwogCWlmICghSEFTX0xMQyhkZXYpKQotCQlvYmogPSBpOTE1X2dlbV9vYmpl
Y3RfY3JlYXRlX3N0b2xlbihkZXYsIHJpbmdidWYtPnNpemUpOworCQlvYmogPSBpOTE1X2dlbV9v
YmplY3RfY3JlYXRlX3N0b2xlbihkZXYsIHJpbmctPnNpemUpOwogCWlmIChvYmogPT0gTlVMTCkK
LQkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShkZXYsIHJpbmdidWYtPnNpemUpOworCQlv
YmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldiwgcmluZy0+c2l6ZSk7CiAJaWYgKElTX0VS
UihvYmopKQogCQlyZXR1cm4gUFRSX0VSUihvYmopOwogCiAJLyogbWFyayByaW5nIGJ1ZmZlcnMg
YXMgcmVhZC1vbmx5IGZyb20gR1BVIHNpZGUgYnkgZGVmYXVsdCAqLwogCW9iai0+Z3Rfcm8gPSAx
OwogCi0JcmluZ2J1Zi0+b2JqID0gb2JqOworCXJpbmctPm9iaiA9IG9iajsKIAogCXJldHVybiAw
OwogfQpAQCAtMjA5MSw3ICsyMDkxLDcgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X2VuZ2luZShz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl
bmdpbmUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk
ZXYpOwotCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nYnVmOworCXN0cnVjdCBpbnRlbF9yaW5nICpy
aW5nOwogCWludCByZXQ7CiAKIAlXQVJOX09OKGVuZ2luZS0+YnVmZmVyKTsKQEAgLTIxMTksMTIg
KzIxMTksMTIgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X2VuZ2luZShzdHJ1Y3QgZHJtX2Rldmlj
ZSAqZGV2LAogCWlmIChyZXQpCiAJCWdvdG8gZXJyb3I7CiAKLQlyaW5nYnVmID0gaW50ZWxfZW5n
aW5lX2NyZWF0ZV9yaW5nKGVuZ2luZSwgMzIgKiBQQUdFX1NJWkUpOwotCWlmIChJU19FUlIocmlu
Z2J1ZikpIHsKLQkJcmV0ID0gUFRSX0VSUihyaW5nYnVmKTsKKwlyaW5nID0gaW50ZWxfZW5naW5l
X2NyZWF0ZV9yaW5nKGVuZ2luZSwgMzIgKiBQQUdFX1NJWkUpOworCWlmIChJU19FUlIocmluZykp
IHsKKwkJcmV0ID0gUFRSX0VSUihyaW5nKTsKIAkJZ290byBlcnJvcjsKIAl9Ci0JZW5naW5lLT5i
dWZmZXIgPSByaW5nYnVmOworCWVuZ2luZS0+YnVmZmVyID0gcmluZzsKIAogCWlmIChJOTE1X05F
RURfR0ZYX0hXUyhkZXZfcHJpdikpIHsKIAkJcmV0ID0gaW5pdF9zdGF0dXNfcGFnZShlbmdpbmUp
OwpAQCAtMjEzNywxMSArMjEzNywxMSBAQCBzdGF0aWMgaW50IGludGVsX2luaXRfZW5naW5lKHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlnb3RvIGVycm9yOwogCX0KIAotCXJldCA9IGludGVs
X3Bpbl9hbmRfbWFwX3JpbmcoZGV2X3ByaXYsIHJpbmdidWYpOworCXJldCA9IGludGVsX3Bpbl9h
bmRfbWFwX3JpbmcoZGV2X3ByaXYsIHJpbmcpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJG
YWlsZWQgdG8gcGluIGFuZCBtYXAgcmluZ2J1ZmZlciAlczogJWRcbiIsCiAJCQkJZW5naW5lLT5u
YW1lLCByZXQpOwotCQlpbnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJpbmdidWYpOworCQlp
bnRlbF9kZXN0cm95X3JpbmdidWZmZXJfb2JqKHJpbmcpOwogCQlnb3RvIGVycm9yOwogCX0KIApk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGRlMGJjNjZhZjQwMS4u
ZWYwMTMzMTg4YTY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n
YnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBA
IC00NzYsNyArNDc2LDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGludGVsX3JpbmdfYWR2YW5jZShz
dHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKIAlyaW5nLT50YWlsICY9IHJpbmctPnNpemUgLSAxOwog
fQogaW50IF9faW50ZWxfcmluZ19zcGFjZShpbnQgaGVhZCwgaW50IHRhaWwsIGludCBzaXplKTsK
LXZvaWQgaW50ZWxfcmluZ191cGRhdGVfc3BhY2Uoc3RydWN0IGludGVsX3JpbmcgKnJpbmdidWYp
Owordm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyk7
CiAKIGludCBfX211c3RfY2hlY2sgaW50ZWxfZW5naW5lX2lkbGUoc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqZW5naW5lKTsKIHZvaWQgaW50ZWxfZW5naW5lX2luaXRfc2Vxbm8oc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgc2Vxbm8pOwpAQCAtNTAwLDkgKzUwMCw5IEBAIHN0YXRp
YyBpbmxpbmUgdTMyIGludGVsX2VuZ2luZV9nZXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqZW5naW5lKQogCiBpbnQgaW5pdF93b3JrYXJvdW5kc19yaW5nKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKmVuZ2luZSk7CiAKLXN0YXRpYyBpbmxpbmUgdTMyIGludGVsX3JpbmdfZ2V0X3RhaWwo
c3RydWN0IGludGVsX3JpbmcgKnJpbmdidWYpCitzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9yaW5n
X2dldF90YWlsKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKQogewotCXJldHVybiByaW5nYnVmLT50
YWlsOworCXJldHVybiByaW5nLT50YWlsOwogfQogCiAvKgotLSAKMi44LjEKCl9fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp
c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=