From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH] drm/i915: Remove intel_ring.last_retired_head
Date: Mon, 20 Mar 2017 21:23:12 +0000
Message-ID: <20170320212312.19341-1-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 9525A6E0E7
 for <intel-gfx@lists.freedesktop.org>; Mon, 20 Mar 2017 21:23:16 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id z133so17109985wmb.2
 for <intel-gfx@lists.freedesktop.org>; Mon, 20 Mar 2017 14:23:16 -0700 (PDT)
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

U3RvcmluZyB0aGUgcG9zaXRpb24gb2YgdGhlIGJyZWFkY3J1bWIgb2YgdGhlIGxhc3QgcmV0aXJl
ZCByZXF1ZXN0IGFzCmEgc2VwYXJhdGUgbGFzdF9yZXRpcmVkX2hlYWQgaXMgc3VwZXJmbHVvdXMg
YXMgd2UgYWx3YXlzIGNvcHkgdGhhdCBpbnRvCmhlYWQgcHJpb3IgdG8gcmVjYWxjdWxhdGlvbiBv
ZiB0aGUgaW50ZWxfcmluZy5zcGFjZS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hy
aXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi
dWdmcy5jICAgICAgICAgIHwgIDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X3JlcXVlc3QuYyAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j
ICAgICAgICAgICAgIHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm
ZXIuYyAgICAgIHwgMjEgKysrKy0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yaW5nYnVmZmVyLmggICAgICB8IDEwIC0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jIHwgIDEgLQogNiBmaWxlcyBjaGFuZ2VkLCA3
IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1
Z2ZzLmMKaW5kZXggNDdlNzA3ZDgzYzRkLi4yOWJmMTFkOGI2MjAgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZGVidWdmcy5jCkBAIC0xOTM4LDkgKzE5MzgsOCBAQCBzdGF0aWMgaW50IGk5MTVfZ2Vt
X2ZyYW1lYnVmZmVyX2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCiBzdGF0
aWMgdm9pZCBkZXNjcmliZV9jdHhfcmluZyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBpbnRl
bF9yaW5nICpyaW5nKQogewotCXNlcV9wcmludGYobSwgIiAocmluZ2J1ZmZlciwgc3BhY2U6ICVk
LCBoZWFkOiAldSwgdGFpbDogJXUsIGxhc3QgaGVhZDogJWQpIiwKLQkJICAgcmluZy0+c3BhY2Us
IHJpbmctPmhlYWQsIHJpbmctPnRhaWwsCi0JCSAgIHJpbmctPmxhc3RfcmV0aXJlZF9oZWFkKTsK
KwlzZXFfcHJpbnRmKG0sICIgKHJpbmdidWZmZXIsIHNwYWNlOiAlZCwgaGVhZDogJXUsIHRhaWw6
ICV1KSIsCisJCSAgIHJpbmctPnNwYWNlLCByaW5nLT5oZWFkLCByaW5nLT50YWlsKTsKIH0KIAog
c3RhdGljIGludCBpOTE1X2NvbnRleHRfc3RhdHVzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAq
dW51c2VkKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVz
dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCmluZGV4IDBlOGQx
MDEwY2VjYi4uZGJmYTlkYjI0MTlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVx
dWVzdC5jCkBAIC0yOTUsNyArMjk1LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9y
ZXRpcmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCSAqIGNvbXBsZXRp
b24gb3JkZXIuCiAJICovCiAJbGlzdF9kZWwoJnJlcXVlc3QtPnJpbmdfbGluayk7Ci0JcmVxdWVz
dC0+cmluZy0+bGFzdF9yZXRpcmVkX2hlYWQgPSByZXF1ZXN0LT5wb3N0Zml4OworCXJlcXVlc3Qt
PnJpbmctPmhlYWQgPSByZXF1ZXN0LT5wb3N0Zml4OwogCWlmICghLS1yZXF1ZXN0LT5pOTE1LT5n
dC5hY3RpdmVfcmVxdWVzdHMpIHsKIAkJR0VNX0JVR19PTighcmVxdWVzdC0+aTkxNS0+Z3QuYXdh
a2UpOwogCQltb2RfZGVsYXllZF93b3JrKHJlcXVlc3QtPmk5MTUtPndxLApkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9scmMuYwppbmRleCBkYWI3M2U3ZDlhNmIuLjI5ZGQ2MTRhYTU0YSAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfbHJjLmMKQEAgLTEyNTUsNyArMTI1NSw2IEBAIHN0YXRpYyB2b2lkIHJlc2V0X2Nv
bW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAljZS0+bHJjX3JlZ19z
dGF0ZVtDVFhfUklOR19IRUFEKzFdID0gcmVxdWVzdC0+cG9zdGZpeDsKIAogCXJlcXVlc3QtPnJp
bmctPmhlYWQgPSByZXF1ZXN0LT5wb3N0Zml4OwotCXJlcXVlc3QtPnJpbmctPmxhc3RfcmV0aXJl
ZF9oZWFkID0gLTE7CiAJaW50ZWxfcmluZ191cGRhdGVfc3BhY2UocmVxdWVzdC0+cmluZyk7CiAK
IAkvKiBDYXRjaCB1cCB3aXRoIGFueSBtaXNzZWQgY29udGV4dC1zd2l0Y2ggaW50ZXJydXB0cyAq
LwpAQCAtMjA0Miw3ICsyMDQxLDYgQEAgdm9pZCBpbnRlbF9scl9jb250ZXh0X3Jlc3VtZShzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlpOTE1X2dlbV9vYmplY3RfdW5waW5f
bWFwKGNlLT5zdGF0ZS0+b2JqKTsKIAogCQkJY2UtPnJpbmctPmhlYWQgPSBjZS0+cmluZy0+dGFp
bCA9IDA7Ci0JCQljZS0+cmluZy0+bGFzdF9yZXRpcmVkX2hlYWQgPSAtMTsKIAkJCWludGVsX3Jp
bmdfdXBkYXRlX3NwYWNlKGNlLT5yaW5nKTsKIAkJfQogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3JpbmdidWZmZXIuYwppbmRleCBkOWI4ZDE3YzNmYzYuLjBjYTVlYTdhOTQwNyAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNDksMTMgKzQ5LDcgQEAgc3Rh
dGljIGludCBfX2ludGVsX3Jpbmdfc3BhY2UoaW50IGhlYWQsIGludCB0YWlsLCBpbnQgc2l6ZSkK
IAogdm9pZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykK
IHsKLQlpZiAocmluZy0+bGFzdF9yZXRpcmVkX2hlYWQgIT0gLTEpIHsKLQkJcmluZy0+aGVhZCA9
IHJpbmctPmxhc3RfcmV0aXJlZF9oZWFkOwotCQlyaW5nLT5sYXN0X3JldGlyZWRfaGVhZCA9IC0x
OwotCX0KLQotCXJpbmctPnNwYWNlID0gX19pbnRlbF9yaW5nX3NwYWNlKHJpbmctPmhlYWQgJiBI
RUFEX0FERFIsCi0JCQkJCSByaW5nLT50YWlsLCByaW5nLT5zaXplKTsKKwlyaW5nLT5zcGFjZSA9
IF9faW50ZWxfcmluZ19zcGFjZShyaW5nLT5oZWFkLCByaW5nLT50YWlsLCByaW5nLT5zaXplKTsK
IH0KIAogc3RhdGljIGludApAQCAtNjE4LDEyICs2MTIsOCBAQCBzdGF0aWMgdm9pZCByZXNldF9y
aW5nX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCX0KIAogCQkvKiBJ
ZiB0aGUgcnEgaHVuZywganVtcCB0byBpdHMgYnJlYWRjcnVtYiBhbmQgc2tpcCB0aGUgYmF0Y2gg
Ki8KLQkJaWYgKHJlcXVlc3QtPmZlbmNlLmVycm9yID09IC1FSU8pIHsKLQkJCXN0cnVjdCBpbnRl
bF9yaW5nICpyaW5nID0gcmVxdWVzdC0+cmluZzsKLQotCQkJcmluZy0+aGVhZCA9IHJlcXVlc3Qt
PnBvc3RmaXg7Ci0JCQlyaW5nLT5sYXN0X3JldGlyZWRfaGVhZCA9IC0xOwotCQl9CisJCWlmIChy
ZXF1ZXN0LT5mZW5jZS5lcnJvciA9PSAtRUlPKQorCQkJcmVxdWVzdC0+cmluZy0+aGVhZCA9IHJl
cXVlc3QtPnBvc3RmaXg7CiAJfSBlbHNlIHsKIAkJZW5naW5lLT5sZWdhY3lfYWN0aXZlX2NvbnRl
eHQgPSBOVUxMOwogCX0KQEAgLTEzOTIsNyArMTM4Miw2IEBAIGludGVsX2VuZ2luZV9jcmVhdGVf
cmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKQogCWlmIChJU19J
ODMwKGVuZ2luZS0+aTkxNSkgfHwgSVNfSTg0NUcoZW5naW5lLT5pOTE1KSkKIAkJcmluZy0+ZWZm
ZWN0aXZlX3NpemUgLT0gMiAqIENBQ0hFTElORV9CWVRFUzsKIAotCXJpbmctPmxhc3RfcmV0aXJl
ZF9oZWFkID0gLTE7CiAJaW50ZWxfcmluZ191cGRhdGVfc3BhY2UocmluZyk7CiAKIAl2bWEgPSBp
bnRlbF9yaW5nX2NyZWF0ZV92bWEoZW5naW5lLT5pOTE1LCBzaXplKTsKQEAgLTE1NzEsMTAgKzE1
NjAsOCBAQCB2b2lkIGludGVsX2xlZ2FjeV9zdWJtaXNzaW9uX3Jlc3VtZShzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwog
CWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwogCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2
X3ByaXYsIGlkKSB7CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKQogCQll
bmdpbmUtPmJ1ZmZlci0+aGVhZCA9IGVuZ2luZS0+YnVmZmVyLT50YWlsOwotCQllbmdpbmUtPmJ1
ZmZlci0+bGFzdF9yZXRpcmVkX2hlYWQgPSAtMTsKLQl9CiB9CiAKIHN0YXRpYyBpbnQgcmluZ19y
ZXF1ZXN0X2FsbG9jKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA4NDdhZWE1NTQ0NjQuLjJlY2I0
MTc4OGZiNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl
ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMTQ5
LDE2ICsxNDksNiBAQCBzdHJ1Y3QgaW50ZWxfcmluZyB7CiAJaW50IHNwYWNlOwogCWludCBzaXpl
OwogCWludCBlZmZlY3RpdmVfc2l6ZTsKLQotCS8qKiBXZSB0cmFjayB0aGUgcG9zaXRpb24gb2Yg
dGhlIHJlcXVlc3RzIGluIHRoZSByaW5nIGJ1ZmZlciwgYW5kCi0JICogd2hlbiBlYWNoIGlzIHJl
dGlyZWQgd2UgaW5jcmVtZW50IGxhc3RfcmV0aXJlZF9oZWFkIGFzIHRoZSBHUFUKLQkgKiBtdXN0
IGhhdmUgZmluaXNoZWQgcHJvY2Vzc2luZyB0aGUgcmVxdWVzdCBhbmQgc28gd2Uga25vdyB3ZQot
CSAqIGNhbiBhZHZhbmNlIHRoZSByaW5nYnVmZmVyIHVwIHRvIHRoYXQgcG9zaXRpb24uCi0JICoK
LQkgKiBsYXN0X3JldGlyZWRfaGVhZCBpcyBzZXQgdG8gLTEgYWZ0ZXIgdGhlIHZhbHVlIGlzIGNv
bnN1bWVkIHNvCi0JICogd2UgY2FuIGRldGVjdCBuZXcgcmV0aXJlbWVudHMuCi0JICovCi0JdTMy
IGxhc3RfcmV0aXJlZF9oZWFkOwogfTsKIAogc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQ7CmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19lbmdpbmUuYyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jCmluZGV4IDhkNWJhMDM3
MDY0Yy4uMGFkNjI0YTFkYjkwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxm
dGVzdHMvbW9ja19lbmdpbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMv
bW9ja19lbmdpbmUuYwpAQCAtMTE4LDcgKzExOCw2IEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfcmlu
ZyAqbW9ja19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyaW5nLT52YWRk
ciA9ICh2b2lkICopKHJpbmcgKyAxKTsKIAogCUlOSVRfTElTVF9IRUFEKCZyaW5nLT5yZXF1ZXN0
X2xpc3QpOwotCXJpbmctPmxhc3RfcmV0aXJlZF9oZWFkID0gLTE7CiAJaW50ZWxfcmluZ191cGRh
dGVfc3BhY2UocmluZyk7CiAKIAlyZXR1cm4gcmluZzsKLS0gCjIuMTEuMAoKX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz
dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0
b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==