From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH 09/11] drm/i915/execlists: Refactor out can_merge_rq() Date: Thu, 31 Jan 2019 09:19:18 +0000 Message-ID: <81bb76a0-b8e0-7a73-06b9-8cfdef719404@linux.intel.com> References: <20190130021906.17933-1-chris@chris-wilson.co.uk> <20190130021906.17933-9-chris@chris-wilson.co.uk> <154887205494.14784.17859887455962500333@skylake-alporthouse-com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0FA526E0FF for ; Thu, 31 Jan 2019 09:19:14 +0000 (UTC) In-Reply-To: <154887205494.14784.17859887455962500333@skylake-alporthouse-com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Ck9uIDMwLzAxLzIwMTkgMTg6MTQsIENocmlzIFdpbHNvbiB3cm90ZToKPiBRdW90aW5nIFR2cnRr byBVcnN1bGluICgyMDE5LTAxLTMwIDE4OjA1OjQyKQo+Pgo+PiBPbiAzMC8wMS8yMDE5IDAyOjE5 LCBDaHJpcyBXaWxzb24gd3JvdGU6Cj4+PiBJbiB0aGUgbmV4dCBwYXRjaCwgd2UgYWRkIGFub3Ro ZXIgdXNlciB0aGF0IHdhbnRzIHRvIGNoZWNrIHdoZXRoZXIKPj4+IHJlcXVlc3RzIGNhbiBiZSBt ZXJnZSBpbnRvIGEgc2luZ2xlIEhXIGV4ZWN1dGlvbiwgYW5kIGluIHRoZSBmdXR1cmUgd2UKPj4+ IHdhbnQgdG8gYWRkIG1vcmUgY29uZGl0aW9ucyB1bmRlciB3aGljaCByZXF1ZXN0cyBmcm9tIHRo ZSBzYW1lIGNvbnRleHQKPj4+IGNhbm5vdCBiZSBtZXJnZS4gSW4gcHJlcGFyYXRpb24sIGV4dHJh Y3Qgb3V0IGNhbl9tZXJnZV9ycSgpLgo+Pj4KPj4+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+Pj4gLS0tCj4+PiAgICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyB8IDMwICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQo+ Pj4gICAgMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQo+ Pj4KPj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4+PiBpbmRleCAyNjE2YjBiM2U4ZDUuLmU5 N2NlNTQxMzhkMyAxMDA2NDQKPj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCj4+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+Pj4gQEAgLTI4 NSwxMiArMjg1LDExIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBuZWVkX3ByZWVtcHQoY29uc3Qgc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAo+Pj4gICAgfQo+Pj4gICAgCj4+PiAgICBfX21h eWJlX3VudXNlZCBzdGF0aWMgaW5saW5lIGJvb2wKPj4+IC1hc3NlcnRfcHJpb3JpdHlfcXVldWUo Y29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cywKPj4+IC0gICAg ICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGk5MTVfcmVxdWVzdCAqcHJldiwKPj4+ICthc3Nl cnRfcHJpb3JpdHlfcXVldWUoY29uc3Qgc3RydWN0IGk5MTVfcmVxdWVzdCAqcHJldiwKPj4+ICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBpOTE1X3JlcXVlc3QgKm5leHQpCj4+PiAg ICB7Cj4+PiAtICAgICBpZiAoIXByZXYpCj4+PiAtICAgICAgICAgICAgIHJldHVybiB0cnVlOwo+ Pj4gKyAgICAgY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cyA9 Cj4+PiArICAgICAgICAgICAgICZwcmV2LT5lbmdpbmUtPmV4ZWNsaXN0czsKPj4+ICAgIAo+Pj4g ICAgICAgIC8qCj4+PiAgICAgICAgICogV2l0aG91dCBwcmVlbXB0aW9uLCB0aGUgcHJldiBtYXkg cmVmZXIgdG8gdGhlIHN0aWxsIGFjdGl2ZSBlbGVtZW50Cj4+PiBAQCAtNjAxLDYgKzYwMCwxNyBA QCBzdGF0aWMgYm9vbCBjYW5fbWVyZ2VfY3R4KGNvbnN0IHN0cnVjdCBpbnRlbF9jb250ZXh0ICpw cmV2LAo+Pj4gICAgICAgIHJldHVybiB0cnVlOwo+Pj4gICAgfQo+Pj4gICAgCj4+PiArc3RhdGlj IGJvb2wgY2FuX21lcmdlX3JxKGNvbnN0IHN0cnVjdCBpOTE1X3JlcXVlc3QgKnByZXYsCj4+PiAr ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBpOTE1X3JlcXVlc3QgKm5leHQpCj4+ PiArewo+Pj4gKyAgICAgR0VNX0JVR19PTighYXNzZXJ0X3ByaW9yaXR5X3F1ZXVlKHByZXYsIG5l eHQpKTsKPj4+ICsKPj4+ICsgICAgIGlmICghY2FuX21lcmdlX2N0eChwcmV2LT5od19jb250ZXh0 LCBuZXh0LT5od19jb250ZXh0KSkKPj4+ICsgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwo+Pj4g Kwo+Pj4gKyAgICAgcmV0dXJuIHRydWU7Cj4+Cj4+IEknbGwgYXNzdW1lIHlvdSdsbCBiZSBhZGRp bmcgaGVyZSBpbiB0aGUgZnV0dXJlIGFzIHRoZSByZWFzb24gdGhpcyBpcwo+PiBub3Qgc2ltcGx5 ICJyZXR1cm4gY2FuX21lcmdlX2N0eCguLi4pIj8KPiAKPiBZZXMsIHJhaXNvbiBkJ2V0cmUgb2Yg bWFraW5nIHRoZSBjaGFuZ2UuCj4gCj4+PiAgICBzdGF0aWMgdm9pZCBwb3J0X2Fzc2lnbihzdHJ1 Y3QgZXhlY2xpc3RfcG9ydCAqcG9ydCwgc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpCj4+PiAgICB7 Cj4+PiAgICAgICAgR0VNX0JVR19PTihycSA9PSBwb3J0X3JlcXVlc3QocG9ydCkpOwo+Pj4gQEAg LTc1Myw4ICs3NjMsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICplbmdpbmUpCj4+PiAgICAgICAgICAgICAgICBpbnQgaTsKPj4+ICAgIAo+ Pj4gICAgICAgICAgICAgICAgcHJpb2xpc3RfZm9yX2VhY2hfcmVxdWVzdF9jb25zdW1lKHJxLCBy biwgcCwgaSkgewo+Pj4gLSAgICAgICAgICAgICAgICAgICAgIEdFTV9CVUdfT04oIWFzc2VydF9w cmlvcml0eV9xdWV1ZShleGVjbGlzdHMsIGxhc3QsIHJxKSk7Cj4+PiAtCj4+PiAgICAgICAgICAg ICAgICAgICAgICAgIC8qCj4+PiAgICAgICAgICAgICAgICAgICAgICAgICAqIENhbiB3ZSBjb21i aW5lIHRoaXMgcmVxdWVzdCB3aXRoIHRoZSBjdXJyZW50IHBvcnQ/Cj4+PiAgICAgICAgICAgICAg ICAgICAgICAgICAqIEl0IGhhcyB0byBiZSB0aGUgc2FtZSBjb250ZXh0L3JpbmdidWZmZXIgYW5k IG5vdAo+Pj4gQEAgLTc2Niw4ICs3NzQsMTAgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVl dWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQo+Pj4gICAgICAgICAgICAgICAgICAg ICAgICAgKiBzZWNvbmQgcmVxdWVzdCwgYW5kIHNvIHdlIG5ldmVyIG5lZWQgdG8gdGVsbCB0aGUK Pj4+ICAgICAgICAgICAgICAgICAgICAgICAgICogaGFyZHdhcmUgYWJvdXQgdGhlIGZpcnN0Lgo+ Pj4gICAgICAgICAgICAgICAgICAgICAgICAgKi8KPj4+IC0gICAgICAgICAgICAgICAgICAgICBp ZiAobGFzdCAmJgo+Pj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAhY2FuX21lcmdlX2N0eChy cS0+aHdfY29udGV4dCwgbGFzdC0+aHdfY29udGV4dCkpIHsKPj4+ICsgICAgICAgICAgICAgICAg ICAgICBpZiAobGFzdCAmJiAhY2FuX21lcmdlX3JxKGxhc3QsIHJxKSkgewo+Pj4gKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKGxhc3QtPmh3X2NvbnRleHQgPT0gcnEtPmh3X2NvbnRl eHQpCj4+PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdvdG8gZG9uZTsK Pj4KPj4gSSBkb24ndCBnZXQgdGhpcyBhZGRlZCBjaGVjay4gQUZBSUNTIGl0IHdpbGwgb25seSB0 cmlnZ2VyIHdpdGggR1ZUCj4+IG1ha2luZyBpdCBub3QgY29uc2lkZXIgZmlsbGluZyBib3RoIHBv cnRzIGlmIHBvc3NpYmxlLgo+IAo+IEJlY2F1c2Ugd2UgYXJlIHByZXBhcmluZyBmb3IgY2FuX21l cmdlX3JxKCkgZGVjaWRpbmcgbm90IHRvIG1lcmdlIHRoZQo+IHNhbWUgY29udGV4dC4gSWYgd2Ug ZG8gdGhhdCB3ZSBjYW4ndCBjb250aW51ZSBvbiB0byB0aGUgbmV4dCBwb3J0IGFuZAo+IG11c3Qg dGVybWluYXRlIHRoZSBsb29wLCB2aW9sYXRpbmcgdGhlIHRyaWNrIHdpdGggdGhlIGhpbnQgaW4g dGhlCj4gcHJvY2Vzcy4KPiAKPiBUaGlzIGNoYW5nZXMgZHVlIHRvIHRoZSBuZXh0IHBhdGNoLCBw ZXItY29udGV4dCBmcmVxIGFuZCBwcm9iYWJseSBtb3JlCj4gdGhhdCBJJ3ZlIGZvcmdvdHRlbi4K CkFmdGVyIGEgc2Vjb25kIGxvb2ssIEkgbm90aWNlZCB0aGUgZXhpc3RpbmcgR1ZUIGNvbW1lbnQg YSBiaXQgbG93ZXIgZG93biAKd2hpY2ggYXZvaWRzIHBvcHVsYXRpbmcgcG9ydDEgYWxyZWFkeS4K Ck1heWJlIG9uZSB0aGluZyB3aGljaCB3b3VsZCBtYWtlIHNlbnNlIGlzIHRvIHJlLWFyYW5nZSB0 aGVzZSBjaGVja3MgaW4gCnRoZSBvcmRlciBvZiAicHJpb3JpdHkiLCBsaWtlOgoKCWlmIChsYXN0 ICYmICFjYW5fbWVyZ2VfcnEoLi4uKSkgewoJCS8vIG5hdHVyYWxseSBoaWdoZXN0IHByaW8gc2lu Y2UgaXQgaXMgaW1wb3NzaWJsZQoJCWlmIChwb3J0ID09IGxhc3RfcG9ydCkKCQkJZ290byBkb25l OwoJCS8vIDJuZCBoaWdoZXN0IHRvIGFjY291bnQgZm9yIHByb2dyYW1taW5nIGxpbWl0YXRpb24K CQllbHNlIGlmIChsYXN0LT5od19jb250ZXh0ID09IHJxLT5od19jb250ZXh0KQoJCQlnb3RvIGRv bmU7CgkJLy8gR1ZUIGNoZWNrIHNpbXBsaWZpZWQgKEkgdGhpbmsgLSBzaW5jZSB3ZSBrbm93IGxh c3QgaXMgZWl0aGVyIApkaWZmZXJlbnQgY3R4IG9yIHNpbmdsZSBzdWJtaXQpCgkJZWxzZSBpZiAo Y3R4X3NpbmdsZV9wb3J0X3N1Ym1pc3Npb24ocnEtPmh3X2NvbnRleHQpKQoJCQlnb3RvIGRvbmU7 Cj4gCj4+PiArCj4+PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyoKPj4+ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKiBJZiB3ZSBhcmUgb24gdGhlIHNlY29uZCBwb3J0 IGFuZCBjYW5ub3QKPj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKiBjb21iaW5l IHRoaXMgcmVxdWVzdCB3aXRoIHRoZSBsYXN0LCB0aGVuIHdlCj4+PiBAQCAtNzg3LDcgKzc5Nyw2 IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKPj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3R4X3Npbmds ZV9wb3J0X3N1Ym1pc3Npb24ocnEtPmh3X2NvbnRleHQpKQo+Pj4gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZ290byBkb25lOwo+Pj4gICAgCj4+PiAtICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBHRU1fQlVHX09OKGxhc3QtPmh3X2NvbnRleHQgPT0gcnEtPmh3X2Nv bnRleHQpOwo+Pgo+PiBUaGlzIGlzIHJlbGF0ZWQgdG8gdGhlIHByZXZpb3VzIGNvbW1lbnQuIFJl YmFzZSBlcnJvcj8KPiAKPiBQcmV2aW91cyBpZiBjaGVjaywgc28gaXQncyBjbGVhciBhdCB0aGlz IHBvaW50IHRoYXQgd2UgY2FuJ3QgYmUgdXNpbmcKPiB0aGUgc2FtZS4KClllcC4KCj4gCj4+PiBA QCAtODI3LDggKzgzNiw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPj4+ICAgICAgICAgKiByZXF1ZXN0IHRyaWdnZXJpbmcg cHJlZW1wdGlvbiBvbiB0aGUgbmV4dCBkZXF1ZXVlIChvciBzdWJzZXF1ZW50Cj4+PiAgICAgICAg ICogaW50ZXJydXB0IGZvciBzZWNvbmRhcnkgcG9ydHMpLgo+Pj4gICAgICAgICAqLwo+Pj4gLSAg ICAgZXhlY2xpc3RzLT5xdWV1ZV9wcmlvcml0eV9oaW50ID0KPj4+IC0gICAgICAgICAgICAgcG9y dCAhPSBleGVjbGlzdHMtPnBvcnQgPyBycV9wcmlvKGxhc3QpIDogSU5UX01JTjsKPj4+ICsgICAg IGV4ZWNsaXN0cy0+cXVldWVfcHJpb3JpdHlfaGludCA9IHF1ZXVlX3ByaW8oZXhlY2xpc3RzKTsK Pj4KPj4gVGhpcyBzaG91bGRuJ3QgYmUgaW4gdGhpcyBwYXRjaC4KPiAKPiBJZiB3ZSB0ZXJtaW5h dGUgdGhlIGxvb3AgZWFybHksIHdlIG5lZWQgdG8gbG9vayBhdCB0aGUgaGVhZCBvZiB0aGUKPiBx dWV1ZS4KCldoeSBpdCBpcyBkaWZmZXJlbnQgZm9yIGVuZGluZyBlYXJseSBmb3IgYW55IG90aGVy IChleGlzdGluZykgcmVhc29uPyAKQWx0aG91Z2ggSSBjb25jZWRlIGJldHRlciBtYW5hZ2VtZW50 IG9mIHF1ZXVlX3ByaW9yaXR5X2hpbnQgaXMgZXhhY3RseSAKd2hhdCBJIHdhcyBzdWdnZXN0aW5n LiBPb3BzLiBDb25zZXF1ZW5jZXMgYXJlIG5vdCBlbnRpcmVseSBzdHJhaWdodCAKZm9yd2FyZCB0 aG91Z2guLiBpZiB3ZSBkZWNpZGUgbm90IHRvIHN1Ym1pdCBhbGwgb2YgYSBzaW5nbGUgY29udGV4 dCwgb3IgCmxlYXZlIHBvcnQxIGVtcHR5LCBjdXJyZW50bHkgd2Ugd291bGQgaGludCBzY2hlZHVs aW5nIHRoZSB0YXNrbGV0IGZvciAKYW55IG5ldyBzdWJtaXNzaW9uLiBXaXRoIHRoaXMgY2hhbmdl IG9ubHkgYWZ0ZXIgYSBDUyBvciBpZiBhIGhpZ2hlciBjdHggCmlzIHN1Ym1pdHRlZC4gV2hpY2gg aXMgd2hhdCBtYWtlcyBtZSBmZWVsIGl0IHNob3VsZCBiZSBhIHNlcGFyYXRlIHBhdGNoIApmb3Ig YSBiZWhhdmlvdXIgY2hhbmdlIChzaW5jZSBhIGhpZ2ggcHJpbywgaGlnaGVyIHRoYW4gSU5UX01J TiwgaXMgCnBvdGVudGlhbGx5IGhlYWQgb2YgdGhlIHF1ZXVlKS4KClJlZ2FyZHMsCgpUdnJ0a28K X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==