From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 3/3] drm/i915: Move find_active_request() to the engine Date: Tue, 5 Mar 2019 18:03:32 +0000 Message-ID: <20190305180332.30900-3-chris@chris-wilson.co.uk> References: <20190305180332.30900-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90CAB89FED for ; Tue, 5 Mar 2019 18:03:48 +0000 (UTC) In-Reply-To: <20190305180332.30900-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VG8gZmluZCB0aGUgYWN0aXZlIHJlcXVlc3QsIHdlIG5lZWQgb25seSBzZWFyY2ggYWxvbmcgdGhl IGluZGl2aWR1YWwKZW5naW5lIGZvciB0aGUgcmlnaHQgcmVxdWVzdC4gVGhpcyBkb2VzIG5vdCBy ZXF1aXJlIHRvdWNoaW5nIGFueSBnbG9iYWwKR0VNIHN0YXRlLCBzbyBtb3ZlIGl0IGludG8gdGhl IGVuZ2luZSBjb21wYXJ0bWVudC4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgICAgICB8ICAzIC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAg fCA0NSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9j cy5jICB8IDQ3ICsrKysrKysrKysrKysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaCB8ICAzICsrCiA1IGZpbGVzIGNoYW5nZWQsIDUwIGluc2VydGlv bnMoKyksIDUwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDA4ZWFk ODU0YWMyZC4uZmYwMzk3NTAwNjlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI5OTYs OSArMjk5Niw2IEBAIHZvaWQgaTkxNV9nZW1fdHJhY2tfZmIoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9sZCwKIAogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9zZXRfZ2xvYmFsX3NlcW5v KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHUzMiBzZXFubyk7CiAKLXN0cnVjdCBpOTE1X3JlcXVl c3QgKgotaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpOwotCiBzdGF0aWMgaW5saW5lIGJvb2wgX19pOTE1X3dlZGdlZChzdHJ1Y3QgaTkx NV9ncHVfZXJyb3IgKmVycm9yKQogewogCXJldHVybiB1bmxpa2VseSh0ZXN0X2JpdChJOTE1X1dF REdFRCwgJmVycm9yLT5mbGFncykpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNjk0MTNm OTllZDA0Li5jNjczNjliZDE0NWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjgwMyw1 MSArMjgwMyw2IEBAIGk5MTVfZ2VtX29iamVjdF9wd3JpdGVfZ3R0KHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmosCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBib29sIG1hdGNoX3Jpbmco c3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gcnEtPmk5MTU7Ci0JdTMyIHJpbmcgPSBJOTE1X1JFQUQoUklOR19TVEFSVChycS0+ ZW5naW5lLT5tbWlvX2Jhc2UpKTsKLQotCXJldHVybiByaW5nID09IGk5MTVfZ2d0dF9vZmZzZXQo cnEtPnJpbmctPnZtYSk7Ci19Ci0KLXN0cnVjdCBpOTE1X3JlcXVlc3QgKgotaTkxNV9nZW1fZmlu ZF9hY3RpdmVfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCi17Ci0Jc3Ry dWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCwgKmFjdGl2ZSA9IE5VTEw7Ci0JdW5zaWduZWQgbG9u ZyBmbGFnczsKLQotCS8qCi0JICogV2UgYXJlIGNhbGxlZCBieSB0aGUgZXJyb3IgY2FwdHVyZSwg cmVzZXQgYW5kIHRvIGR1bXAgZW5naW5lCi0JICogc3RhdGUgYXQgcmFuZG9tIHBvaW50cyBpbiB0 aW1lLiBJbiBwYXJ0aWN1bGFyLCBub3RlIHRoYXQgbmVpdGhlciBpcwotCSAqIGNydWNpYWxseSBv cmRlcmVkIHdpdGggYW4gaW50ZXJydXB0LiBBZnRlciBhIGhhbmcsIHRoZSBHUFUgaXMgZGVhZAot CSAqIGFuZCB3ZSBhc3N1bWUgdGhhdCBubyBtb3JlIHdyaXRlcyBjYW4gaGFwcGVuICh3ZSB3YWl0 ZWQgbG9uZyBlbm91Z2gKLQkgKiBmb3IgYWxsIHdyaXRlcyB0aGF0IHdlcmUgaW4gdHJhbnNhY3Rp b24gdG8gYmUgZmx1c2hlZCkgLSBhZGRpbmcgYW4KLQkgKiBleHRyYSBkZWxheSBmb3IgYSByZWNl bnQgaW50ZXJydXB0IGlzIHBvaW50bGVzcy4gSGVuY2UsIHdlIGRvCi0JICogbm90IG5lZWQgYW4g ZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcigpIGJlZm9yZSB0aGUgc2Vxbm8gcmVhZHMuCi0JICog QXQgYWxsIG90aGVyIHRpbWVzLCB3ZSBtdXN0IGFzc3VtZSB0aGUgR1BVIGlzIHN0aWxsIHJ1bm5p bmcsIGJ1dAotCSAqIHdlIG9ubHkgY2FyZSBhYm91dCB0aGUgc25hcHNob3Qgb2YgdGhpcyBtb21l bnQuCi0JICovCi0Jc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+dGltZWxpbmUubG9jaywgZmxh Z3MpOwotCWxpc3RfZm9yX2VhY2hfZW50cnkocmVxdWVzdCwgJmVuZ2luZS0+dGltZWxpbmUucmVx dWVzdHMsIGxpbmspIHsKLQkJaWYgKGk5MTVfcmVxdWVzdF9jb21wbGV0ZWQocmVxdWVzdCkpCi0J CQljb250aW51ZTsKLQotCQlpZiAoIWk5MTVfcmVxdWVzdF9zdGFydGVkKHJlcXVlc3QpKQotCQkJ YnJlYWs7Ci0KLQkJLyogTW9yZSB0aGFuIG9uZSBwcmVlbXB0aWJsZSByZXF1ZXN0IG1heSBtYXRj aCEgKi8KLQkJaWYgKCFtYXRjaF9yaW5nKHJlcXVlc3QpKQotCQkJYnJlYWs7Ci0KLQkJYWN0aXZl ID0gcmVxdWVzdDsKLQkJYnJlYWs7Ci0JfQotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmVuZ2lu ZS0+dGltZWxpbmUubG9jaywgZmxhZ3MpOwotCi0JcmV0dXJuIGFjdGl2ZTsKLX0KLQogc3RhdGlj IHZvaWQKIGk5MTVfZ2VtX3JldGlyZV93b3JrX2hhbmRsZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3 b3JrKQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggNWYxY2RiYzll YjVkLi4zZDgwMjA4ODg2MDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpA QCAtMTQxMSw3ICsxNDExLDcgQEAgc3RhdGljIHZvaWQgZ2VtX3JlY29yZF9yaW5ncyhzdHJ1Y3Qg aTkxNV9ncHVfc3RhdGUgKmVycm9yKQogCQllcnJvcl9yZWNvcmRfZW5naW5lX3JlZ2lzdGVycyhl cnJvciwgZW5naW5lLCBlZSk7CiAJCWVycm9yX3JlY29yZF9lbmdpbmVfZXhlY2xpc3RzKGVuZ2lu ZSwgZWUpOwogCi0JCXJlcXVlc3QgPSBpOTE1X2dlbV9maW5kX2FjdGl2ZV9yZXF1ZXN0KGVuZ2lu ZSk7CisJCXJlcXVlc3QgPSBpbnRlbF9lbmdpbmVfZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUp OwogCQlpZiAocmVxdWVzdCkgewogCQkJc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCA9IHJl cXVlc3QtPmdlbV9jb250ZXh0OwogCQkJc3RydWN0IGludGVsX3JpbmcgKnJpbmc7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCmluZGV4IDYyYTJiYmJiY2M2NC4uNTU1YTQ1OTBm YTIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwpAQCAtMTU0NSw3ICsx NTQ1LDcgQEAgdm9pZCBpbnRlbF9lbmdpbmVfZHVtcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUsCiAJaWYgKCZycS0+bGluayAhPSAmZW5naW5lLT50aW1lbGluZS5yZXF1ZXN0cykKIAkJ cHJpbnRfcmVxdWVzdChtLCBycSwgIlx0XHRsYXN0ICAgIik7CiAKLQlycSA9IGk5MTVfZ2VtX2Zp bmRfYWN0aXZlX3JlcXVlc3QoZW5naW5lKTsKKwlycSA9IGludGVsX2VuZ2luZV9maW5kX2FjdGl2 ZV9yZXF1ZXN0KGVuZ2luZSk7CiAJaWYgKHJxKSB7CiAJCXByaW50X3JlcXVlc3QobSwgcnEsICJc dFx0YWN0aXZlICIpOwogCkBAIC0xNzEyLDYgKzE3MTIsNTEgQEAgdm9pZCBpbnRlbF9kaXNhYmxl X2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJd3JpdGVfc2Vx dW5sb2NrX2lycXJlc3RvcmUoJmVuZ2luZS0+c3RhdHMubG9jaywgZmxhZ3MpOwogfQogCitzdGF0 aWMgYm9vbCBtYXRjaF9yaW5nKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKQoreworCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJxLT5pOTE1OworCXUzMiByaW5nID0gSTkxNV9S RUFEKFJJTkdfU1RBUlQocnEtPmVuZ2luZS0+bW1pb19iYXNlKSk7CisKKwlyZXR1cm4gcmluZyA9 PSBpOTE1X2dndHRfb2Zmc2V0KHJxLT5yaW5nLT52bWEpOworfQorCitzdHJ1Y3QgaTkxNV9yZXF1 ZXN0ICoKK2ludGVsX2VuZ2luZV9maW5kX2FjdGl2ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0LCAqYWN0aXZl ID0gTlVMTDsKKwl1bnNpZ25lZCBsb25nIGZsYWdzOworCisJLyoKKwkgKiBXZSBhcmUgY2FsbGVk IGJ5IHRoZSBlcnJvciBjYXB0dXJlLCByZXNldCBhbmQgdG8gZHVtcCBlbmdpbmUKKwkgKiBzdGF0 ZSBhdCByYW5kb20gcG9pbnRzIGluIHRpbWUuIEluIHBhcnRpY3VsYXIsIG5vdGUgdGhhdCBuZWl0 aGVyIGlzCisJICogY3J1Y2lhbGx5IG9yZGVyZWQgd2l0aCBhbiBpbnRlcnJ1cHQuIEFmdGVyIGEg aGFuZywgdGhlIEdQVSBpcyBkZWFkCisJICogYW5kIHdlIGFzc3VtZSB0aGF0IG5vIG1vcmUgd3Jp dGVzIGNhbiBoYXBwZW4gKHdlIHdhaXRlZCBsb25nIGVub3VnaAorCSAqIGZvciBhbGwgd3JpdGVz IHRoYXQgd2VyZSBpbiB0cmFuc2FjdGlvbiB0byBiZSBmbHVzaGVkKSAtIGFkZGluZyBhbgorCSAq IGV4dHJhIGRlbGF5IGZvciBhIHJlY2VudCBpbnRlcnJ1cHQgaXMgcG9pbnRsZXNzLiBIZW5jZSwg d2UgZG8KKwkgKiBub3QgbmVlZCBhbiBlbmdpbmUtPmlycV9zZXFub19iYXJyaWVyKCkgYmVmb3Jl IHRoZSBzZXFubyByZWFkcy4KKwkgKiBBdCBhbGwgb3RoZXIgdGltZXMsIHdlIG11c3QgYXNzdW1l IHRoZSBHUFUgaXMgc3RpbGwgcnVubmluZywgYnV0CisJICogd2Ugb25seSBjYXJlIGFib3V0IHRo ZSBzbmFwc2hvdCBvZiB0aGlzIG1vbWVudC4KKwkgKi8KKwlzcGluX2xvY2tfaXJxc2F2ZSgmZW5n aW5lLT50aW1lbGluZS5sb2NrLCBmbGFncyk7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShyZXF1ZXN0 LCAmZW5naW5lLT50aW1lbGluZS5yZXF1ZXN0cywgbGluaykgeworCQlpZiAoaTkxNV9yZXF1ZXN0 X2NvbXBsZXRlZChyZXF1ZXN0KSkKKwkJCWNvbnRpbnVlOworCisJCWlmICghaTkxNV9yZXF1ZXN0 X3N0YXJ0ZWQocmVxdWVzdCkpCisJCQlicmVhazsKKworCQkvKiBNb3JlIHRoYW4gb25lIHByZWVt cHRpYmxlIHJlcXVlc3QgbWF5IG1hdGNoISAqLworCQlpZiAoIW1hdGNoX3JpbmcocmVxdWVzdCkp CisJCQlicmVhazsKKworCQlhY3RpdmUgPSByZXF1ZXN0OworCQlicmVhazsKKwl9CisJc3Bpbl91 bmxvY2tfaXJxcmVzdG9yZSgmZW5naW5lLT50aW1lbGluZS5sb2NrLCBmbGFncyk7CisKKwlyZXR1 cm4gYWN0aXZlOworfQorCiAjaWYgSVNfRU5BQkxFRChDT05GSUdfRFJNX0k5MTVfU0VMRlRFU1Qp CiAjaW5jbHVkZSAic2VsZnRlc3RzL21vY2tfZW5naW5lLmMiCiAjaW5jbHVkZSAic2VsZnRlc3Rz L2ludGVsX2VuZ2luZV9jcy5jIgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CmluZGV4IDE4ZTg2NWZmNjYzNy4uODRiNzA0N2UyZGY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xMDE0LDYgKzEwMTQsOSBAQCB2b2lkIGludGVsX2Rpc2Fi bGVfZW5naW5lX3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKIGt0aW1l X3QgaW50ZWxfZW5naW5lX2dldF9idXN5X3RpbWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKTsKIAorc3RydWN0IGk5MTVfcmVxdWVzdCAqCitpbnRlbF9lbmdpbmVfZmluZF9hY3RpdmVf cmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOworCiAjaWYgSVNfRU5BQkxF RChDT05GSUdfRFJNX0k5MTVfU0VMRlRFU1QpCiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBpbmplY3Rf cHJlZW1wdF9oYW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICpleGVjbGlzdHMpCi0t IAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==