From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 10/11] drm/i915: Move engine request retirement
 to intel_engine_cs
Date: Thu, 31 May 2018 19:52:03 +0100
Message-ID: <20180531185204.19520-11-chris@chris-wilson.co.uk>
References: <20180531185204.19520-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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id A8FE16E366
 for <intel-gfx@lists.freedesktop.org>; Thu, 31 May 2018 18:52:35 +0000 (UTC)
In-Reply-To: <20180531185204.19520-1-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

SW4gdGhlIG5leHQgcGF0Y2gsIHdlIHdpbGwgbW92ZSBvd25lcnNoaXAgb2YgdGhlIGZlbmNlIHJl
ZmVyZW5jZSB0byB0aGUKc3VibWlzc2lvbiBiYWNrZW5kIGFuZCB3aWxsIHdhbnQgdG8gZHJvcCBp
dHMgZmluYWwgcmVmZXJlbmNlIHdoZW4KcmV0aXJpbmcgaXQgZnJvbSB0aGUgc3VibWlzc2lvbiBi
YWNrZW5kLiBXZSB3aWxsIGFsc28gbmVlZCBhIGNhdGNoIHVwCndoZW4gcGFya2luZyB0aGUgZW5n
aW5lIHRvIGNsZWFudXAgYW55IHJlc2lkdWFsIGVudHJpZXMgaW4gdGhlIGVuZ2luZQp0aW1lbGlu
ZS4gSW4gc2hvcnQsIG1vdmUgdGhlIGVuZ2luZSByZXRpcmVtZW50IGZyb20gaTkxNV9yZXF1ZXN0
LmMgdG8KaW50ZWxfZW5naW5lX2NzLmMgZm9yIGZ1dHVyZSB1c2UuCgpTaWduZWQtb2ZmLWJ5OiBD
aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X3JlcXVlc3QuYyAgICAgfCA0NyArLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jICB8IDU0ICsrKysrKysrKysrKysr
KysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICAy
ICsKIDMgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgNDYgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXF1ZXN0LmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3QuYwppbmRleCA3OTZkYWQyNWU2YmEuLmY5MTk0MmU0
ZDg1MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXF1ZXN0LmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXF1ZXN0LmMKQEAgLTM0NCw1MCArMzQ0LDYg
QEAgc3RhdGljIHZvaWQgZnJlZV9jYXB0dXJlX2xpc3Qoc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVx
dWVzdCkKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIF9fcmV0aXJlX2VuZ2luZV9yZXF1ZXN0KHN0cnVj
dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKLQkJCQkgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAq
cnEpCi17Ci0JR0VNX1RSQUNFKCIlcyglcykgZmVuY2UgJWxseDolZCwgZ2xvYmFsPSVkLCBjdXJy
ZW50ICVkXG4iLAotCQkgIF9fZnVuY19fLCBlbmdpbmUtPm5hbWUsCi0JCSAgcnEtPmZlbmNlLmNv
bnRleHQsIHJxLT5mZW5jZS5zZXFubywKLQkJICBycS0+Z2xvYmFsX3NlcW5vLAotCQkgIGludGVs
X2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKSk7Ci0KLQlHRU1fQlVHX09OKCFpOTE1X3JlcXVlc3Rf
Y29tcGxldGVkKHJxKSk7Ci0KLQlsb2NhbF9pcnFfZGlzYWJsZSgpOwotCi0Jc3Bpbl9sb2NrKCZl
bmdpbmUtPnRpbWVsaW5lLmxvY2spOwotCUdFTV9CVUdfT04oIWxpc3RfaXNfZmlyc3QoJnJxLT5s
aW5rLCAmZW5naW5lLT50aW1lbGluZS5yZXF1ZXN0cykpOwotCWxpc3RfZGVsX2luaXQoJnJxLT5s
aW5rKTsKLQlzcGluX3VubG9jaygmZW5naW5lLT50aW1lbGluZS5sb2NrKTsKLQotCXNwaW5fbG9j
aygmcnEtPmxvY2spOwotCWlmICghdGVzdF9iaXQoRE1BX0ZFTkNFX0ZMQUdfU0lHTkFMRURfQklU
LCAmcnEtPmZlbmNlLmZsYWdzKSkKLQkJZG1hX2ZlbmNlX3NpZ25hbF9sb2NrZWQoJnJxLT5mZW5j
ZSk7Ci0JaWYgKHRlc3RfYml0KERNQV9GRU5DRV9GTEFHX0VOQUJMRV9TSUdOQUxfQklULCAmcnEt
PmZlbmNlLmZsYWdzKSkKLQkJaW50ZWxfZW5naW5lX2NhbmNlbF9zaWduYWxpbmcocnEpOwotCWlm
IChycS0+d2FpdGJvb3N0KSB7Ci0JCUdFTV9CVUdfT04oIWF0b21pY19yZWFkKCZycS0+aTkxNS0+
Z3RfcG0ucnBzLm51bV93YWl0ZXJzKSk7Ci0JCWF0b21pY19kZWMoJnJxLT5pOTE1LT5ndF9wbS5y
cHMubnVtX3dhaXRlcnMpOwotCX0KLQlzcGluX3VubG9jaygmcnEtPmxvY2spOwotCi0JbG9jYWxf
aXJxX2VuYWJsZSgpOwotCi0JLyoKLQkgKiBUaGUgYmFja2luZyBvYmplY3QgZm9yIHRoZSBjb250
ZXh0IGlzIGRvbmUgYWZ0ZXIgc3dpdGNoaW5nIHRvIHRoZQotCSAqICpuZXh0KiBjb250ZXh0LiBU
aGVyZWZvcmUgd2UgY2Fubm90IHJldGlyZSB0aGUgcHJldmlvdXMgY29udGV4dCB1bnRpbAotCSAq
IHRoZSBuZXh0IGNvbnRleHQgaGFzIGFscmVhZHkgc3RhcnRlZCBydW5uaW5nLiBIb3dldmVyLCBz
aW5jZSB3ZQotCSAqIGNhbm5vdCB0YWtlIHRoZSByZXF1aXJlZCBsb2NrcyBhdCBpOTE1X3JlcXVl
c3Rfc3VibWl0KCkgd2UKLQkgKiBkZWZlciB0aGUgdW5waW5uaW5nIG9mIHRoZSBhY3RpdmUgY29u
dGV4dCB0byBub3csIHJldGlyZW1lbnQgb2YKLQkgKiB0aGUgc3Vic2VxdWVudCByZXF1ZXN0Lgot
CSAqLwotCWlmIChlbmdpbmUtPmxhc3RfcmV0aXJlZF9jb250ZXh0KQotCQlpbnRlbF9jb250ZXh0
X3VucGluKGVuZ2luZS0+bGFzdF9yZXRpcmVkX2NvbnRleHQpOwotCWVuZ2luZS0+bGFzdF9yZXRp
cmVkX2NvbnRleHQgPSBycS0+aHdfY29udGV4dDsKLX0KLQogc3RhdGljIHZvaWQgX19yZXRpcmVf
ZW5naW5lX3VwdG8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJCSBzdHJ1Y3Qg
aTkxNV9yZXF1ZXN0ICpycSkKIHsKQEAgLTQwMCw4ICszNTYsNyBAQCBzdGF0aWMgdm9pZCBfX3Jl
dGlyZV9lbmdpbmVfdXB0byhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCXRtcCA9
IGxpc3RfZmlyc3RfZW50cnkoJmVuZ2luZS0+dGltZWxpbmUucmVxdWVzdHMsCiAJCQkJICAgICAg
IHR5cGVvZigqdG1wKSwgbGluayk7CiAKLQkJR0VNX0JVR19PTih0bXAtPmVuZ2luZSAhPSBlbmdp
bmUpOwotCQlfX3JldGlyZV9lbmdpbmVfcmVxdWVzdChlbmdpbmUsIHRtcCk7CisJCWludGVsX2Vu
Z2luZV9yZXRpcmVfcmVxdWVzdChlbmdpbmUsIHRtcCk7CiAJfSB3aGlsZSAodG1wICE9IHJxKTsK
IH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCA0Mzg4MGJmMGY1
MjkuLmNjZTcyMzRiOTA3MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZW5naW5lX2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMK
QEAgLTEwNjQsNiArMTA2NCw2MCBAQCB2b2lkIGludGVsX2VuZ2luZXNfcmVzZXRfZGVmYXVsdF9z
dWJtaXNzaW9uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCQllbmdpbmUtPnNldF9k
ZWZhdWx0X3N1Ym1pc3Npb24oZW5naW5lKTsKIH0KIAorLyoqCisgKiBpbnRlbF9lbmdpbmVzX3Jl
dGlyZV9yZXF1ZXN0OiBkcm9wIHRoZSByZXF1ZXN0IHJlZmVyZW5jZSBmcm9tIHRoZSBlbmdpbmUK
KyAqIEBlbmdpbmU6IHRoZSBlbmdpbmUKKyAqIEBycTogdGhlIHJlcXVlc3QKKyAqCisgKiBUaGlz
IHJlcXVlc3QgaGFzIGJlZW4gY29tcGxldGVkIGFuZCBpcyBwYXJ0IG9mIHRoZSBjaGFpbiBiZWlu
ZyByZXRpcmVkIGJ5CisgKiB0aGUgY2FsbGVyLCBzbyBkcm9wIGFueSByZWZlcmVuY2UgdG8gaXQg
ZnJvbSB0aGUgZW5naW5lLgorICovCit2b2lkIGludGVsX2VuZ2luZV9yZXRpcmVfcmVxdWVzdChz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkJIHN0cnVjdCBpOTE1X3JlcXVlc3Qg
KnJxKQoreworCUdFTV9UUkFDRSgiJXMoJXMpIGZlbmNlICVsbHg6JWQsIGdsb2JhbD0lZCwgY3Vy
cmVudCAlZFxuIiwKKwkJICBfX2Z1bmNfXywgZW5naW5lLT5uYW1lLAorCQkgIHJxLT5mZW5jZS5j
b250ZXh0LCBycS0+ZmVuY2Uuc2Vxbm8sCisJCSAgcnEtPmdsb2JhbF9zZXFubywKKwkJICBpbnRl
bF9lbmdpbmVfZ2V0X3NlcW5vKGVuZ2luZSkpOworCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmZW5n
aW5lLT5pOTE1LT5kcm0uc3RydWN0X211dGV4KTsKKwlHRU1fQlVHX09OKHJxLT5lbmdpbmUgIT0g
ZW5naW5lKTsKKwlHRU1fQlVHX09OKCFpOTE1X3JlcXVlc3RfY29tcGxldGVkKHJxKSk7CisKKwls
b2NhbF9pcnFfZGlzYWJsZSgpOworCisJc3Bpbl9sb2NrKCZlbmdpbmUtPnRpbWVsaW5lLmxvY2sp
OworCUdFTV9CVUdfT04oIWxpc3RfaXNfZmlyc3QoJnJxLT5saW5rLCAmZW5naW5lLT50aW1lbGlu
ZS5yZXF1ZXN0cykpOworCWxpc3RfZGVsX2luaXQoJnJxLT5saW5rKTsKKwlzcGluX3VubG9jaygm
ZW5naW5lLT50aW1lbGluZS5sb2NrKTsKKworCXNwaW5fbG9jaygmcnEtPmxvY2spOworCWlmICgh
dGVzdF9iaXQoRE1BX0ZFTkNFX0ZMQUdfU0lHTkFMRURfQklULCAmcnEtPmZlbmNlLmZsYWdzKSkK
KwkJZG1hX2ZlbmNlX3NpZ25hbF9sb2NrZWQoJnJxLT5mZW5jZSk7CisJaWYgKHRlc3RfYml0KERN
QV9GRU5DRV9GTEFHX0VOQUJMRV9TSUdOQUxfQklULCAmcnEtPmZlbmNlLmZsYWdzKSkKKwkJaW50
ZWxfZW5naW5lX2NhbmNlbF9zaWduYWxpbmcocnEpOworCWlmIChycS0+d2FpdGJvb3N0KSB7CisJ
CUdFTV9CVUdfT04oIWF0b21pY19yZWFkKCZycS0+aTkxNS0+Z3RfcG0ucnBzLm51bV93YWl0ZXJz
KSk7CisJCWF0b21pY19kZWMoJnJxLT5pOTE1LT5ndF9wbS5ycHMubnVtX3dhaXRlcnMpOworCX0K
KwlzcGluX3VubG9jaygmcnEtPmxvY2spOworCisJbG9jYWxfaXJxX2VuYWJsZSgpOworCisJLyoK
KwkgKiBUaGUgYmFja2luZyBvYmplY3QgZm9yIHRoZSBjb250ZXh0IGlzIGRvbmUgYWZ0ZXIgc3dp
dGNoaW5nIHRvIHRoZQorCSAqICpuZXh0KiBjb250ZXh0LiBUaGVyZWZvcmUgd2UgY2Fubm90IHJl
dGlyZSB0aGUgcHJldmlvdXMgY29udGV4dCB1bnRpbAorCSAqIHRoZSBuZXh0IGNvbnRleHQgaGFz
IGFscmVhZHkgc3RhcnRlZCBydW5uaW5nLiBIb3dldmVyLCBzaW5jZSB3ZQorCSAqIGNhbm5vdCB0
YWtlIHRoZSByZXF1aXJlZCBsb2NrcyBhdCBpOTE1X3JlcXVlc3Rfc3VibWl0KCkgd2UKKwkgKiBk
ZWZlciB0aGUgdW5waW5uaW5nIG9mIHRoZSBhY3RpdmUgY29udGV4dCB0byBub3csIHJldGlyZW1l
bnQgb2YKKwkgKiB0aGUgc3Vic2VxdWVudCByZXF1ZXN0LgorCSAqLworCWlmIChlbmdpbmUtPmxh
c3RfcmV0aXJlZF9jb250ZXh0KQorCQlpbnRlbF9jb250ZXh0X3VucGluKGVuZ2luZS0+bGFzdF9y
ZXRpcmVkX2NvbnRleHQpOworCWVuZ2luZS0+bGFzdF9yZXRpcmVkX2NvbnRleHQgPSBycS0+aHdf
Y29udGV4dDsKK30KKwogLyoqCiAgKiBpbnRlbF9lbmdpbmVzX3Bhcms6IGNhbGxlZCB3aGVuIHRo
ZSBHVCBpcyB0cmFuc2l0aW9uaW5nIGZyb20gYnVzeS0+aWRsZQogICogQGk5MTU6IHRoZSBpOTE1
IGRldmljZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl
ci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGYwMjM0
NjI5MTA4MC4uYmQwMDY3MDQ3MDQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1
ZmZlci5oCkBAIC04ODgsNiArODg4LDggQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVy
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiBpbnQgaW50ZWxfaW5pdF9ibHRfcmlu
Z19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGludCBpbnRlbF9pbml0
X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKK3Zv
aWQgaW50ZWxfZW5naW5lX3JldGlyZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu
Z2luZSwKKwkJCQkgc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpOwogaW50IGludGVsX2VuZ2luZV9z
dG9wX2NzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIHU2NCBpbnRlbF9lbmdp
bmVfZ2V0X2FjdGl2ZV9oZWFkKGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7
Ci0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y
ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm
eAo=