From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 07/37] drm/i915: Move engine request retirement
 to intel_engine_cs
Date: Fri, 29 Jun 2018 08:53:18 +0100
Message-ID: <20180629075348.27358-7-chris@chris-wilson.co.uk>
References: <20180629075348.27358-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 67E046EF32
 for <intel-gfx@lists.freedesktop.org>; Fri, 29 Jun 2018 07:54:09 +0000 (UTC)
In-Reply-To: <20180629075348.27358-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
L2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3QuYwppbmRleCA0ZWVhN2EyNzI5MWYuLjlmZjZkMTRh
MGZlZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXF1ZXN0LmMKKysr
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
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCAwMTg2Mjg4NGE0
MzYuLjYzZjYwYWI5MDhiNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZW5naW5lX2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMK
QEAgLTEwODksNiArMTA4OSw2MCBAQCB2b2lkIGludGVsX2VuZ2luZXNfc2FuaXRpemUoc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJfQogfQogCisvKioKKyAqIGludGVsX2VuZ2luZXNf
cmV0aXJlX3JlcXVlc3Q6IGRyb3AgdGhlIHJlcXVlc3QgcmVmZXJlbmNlIGZyb20gdGhlIGVuZ2lu
ZQorICogQGVuZ2luZTogdGhlIGVuZ2luZQorICogQHJxOiB0aGUgcmVxdWVzdAorICoKKyAqIFRo
aXMgcmVxdWVzdCBoYXMgYmVlbiBjb21wbGV0ZWQgYW5kIGlzIHBhcnQgb2YgdGhlIGNoYWluIGJl
aW5nIHJldGlyZWQgYnkKKyAqIHRoZSBjYWxsZXIsIHNvIGRyb3AgYW55IHJlZmVyZW5jZSB0byBp
dCBmcm9tIHRoZSBlbmdpbmUuCisgKi8KK3ZvaWQgaW50ZWxfZW5naW5lX3JldGlyZV9yZXF1ZXN0
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkJCQkgc3RydWN0IGk5MTVfcmVxdWVz
dCAqcnEpCit7CisJR0VNX1RSQUNFKCIlcyglcykgZmVuY2UgJWxseDolZCwgZ2xvYmFsPSVkLCBj
dXJyZW50ICVkXG4iLAorCQkgIF9fZnVuY19fLCBlbmdpbmUtPm5hbWUsCisJCSAgcnEtPmZlbmNl
LmNvbnRleHQsIHJxLT5mZW5jZS5zZXFubywKKwkJICBycS0+Z2xvYmFsX3NlcW5vLAorCQkgIGlu
dGVsX2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKSk7CisKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZl
bmdpbmUtPmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOworCUdFTV9CVUdfT04ocnEtPmVuZ2luZSAh
PSBlbmdpbmUpOworCUdFTV9CVUdfT04oIWk5MTVfcmVxdWVzdF9jb21wbGV0ZWQocnEpKTsKKwor
CWxvY2FsX2lycV9kaXNhYmxlKCk7CisKKwlzcGluX2xvY2soJmVuZ2luZS0+dGltZWxpbmUubG9j
ayk7CisJR0VNX0JVR19PTighbGlzdF9pc19maXJzdCgmcnEtPmxpbmssICZlbmdpbmUtPnRpbWVs
aW5lLnJlcXVlc3RzKSk7CisJbGlzdF9kZWxfaW5pdCgmcnEtPmxpbmspOworCXNwaW5fdW5sb2Nr
KCZlbmdpbmUtPnRpbWVsaW5lLmxvY2spOworCisJc3Bpbl9sb2NrKCZycS0+bG9jayk7CisJaWYg
KCF0ZXN0X2JpdChETUFfRkVOQ0VfRkxBR19TSUdOQUxFRF9CSVQsICZycS0+ZmVuY2UuZmxhZ3Mp
KQorCQlkbWFfZmVuY2Vfc2lnbmFsX2xvY2tlZCgmcnEtPmZlbmNlKTsKKwlpZiAodGVzdF9iaXQo
RE1BX0ZFTkNFX0ZMQUdfRU5BQkxFX1NJR05BTF9CSVQsICZycS0+ZmVuY2UuZmxhZ3MpKQorCQlp
bnRlbF9lbmdpbmVfY2FuY2VsX3NpZ25hbGluZyhycSk7CisJaWYgKHJxLT53YWl0Ym9vc3QpIHsK
KwkJR0VNX0JVR19PTighYXRvbWljX3JlYWQoJnJxLT5pOTE1LT5ndF9wbS5ycHMubnVtX3dhaXRl
cnMpKTsKKwkJYXRvbWljX2RlYygmcnEtPmk5MTUtPmd0X3BtLnJwcy5udW1fd2FpdGVycyk7CisJ
fQorCXNwaW5fdW5sb2NrKCZycS0+bG9jayk7CisKKwlsb2NhbF9pcnFfZW5hYmxlKCk7CisKKwkv
KgorCSAqIFRoZSBiYWNraW5nIG9iamVjdCBmb3IgdGhlIGNvbnRleHQgaXMgZG9uZSBhZnRlciBz
d2l0Y2hpbmcgdG8gdGhlCisJICogKm5leHQqIGNvbnRleHQuIFRoZXJlZm9yZSB3ZSBjYW5ub3Qg
cmV0aXJlIHRoZSBwcmV2aW91cyBjb250ZXh0IHVudGlsCisJICogdGhlIG5leHQgY29udGV4dCBo
YXMgYWxyZWFkeSBzdGFydGVkIHJ1bm5pbmcuIEhvd2V2ZXIsIHNpbmNlIHdlCisJICogY2Fubm90
IHRha2UgdGhlIHJlcXVpcmVkIGxvY2tzIGF0IGk5MTVfcmVxdWVzdF9zdWJtaXQoKSB3ZQorCSAq
IGRlZmVyIHRoZSB1bnBpbm5pbmcgb2YgdGhlIGFjdGl2ZSBjb250ZXh0IHRvIG5vdywgcmV0aXJl
bWVudCBvZgorCSAqIHRoZSBzdWJzZXF1ZW50IHJlcXVlc3QuCisJICovCisJaWYgKGVuZ2luZS0+
bGFzdF9yZXRpcmVkX2NvbnRleHQpCisJCWludGVsX2NvbnRleHRfdW5waW4oZW5naW5lLT5sYXN0
X3JldGlyZWRfY29udGV4dCk7CisJZW5naW5lLT5sYXN0X3JldGlyZWRfY29udGV4dCA9IHJxLT5o
d19jb250ZXh0OworfQorCiAvKioKICAqIGludGVsX2VuZ2luZXNfcGFyazogY2FsbGVkIHdoZW4g
dGhlIEdUIGlzIHRyYW5zaXRpb25pbmcgZnJvbSBidXN5LT5pZGxlCiAgKiBAaTkxNTogdGhlIGk5
MTUgZGV2aWNlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm
ZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggY2U2
Y2MyYTZjZjdhLi41NDY3OGJkMDZmZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n
YnVmZmVyLmgKQEAgLTkwMCw2ICs5MDAsOCBAQCBpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZm
ZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIGludCBpbnRlbF9pbml0X2JsdF9y
aW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogaW50IGludGVsX2lu
aXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAor
dm9pZCBpbnRlbF9lbmdpbmVfcmV0aXJlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq
ZW5naW5lLAorCQkJCSBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSk7CiBpbnQgaW50ZWxfZW5naW5l
X3N0b3BfY3Moc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKIAogdTY0IGludGVsX2Vu
Z2luZV9nZXRfYWN0aXZlX2hlYWQoY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l
KTsKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt
Z2Z4Cg==