From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH 19/22] drm/i915/execlists: Refactor out can_merge_rq() Date: Mon, 4 Feb 2019 19:02:03 +0000 Message-ID: References: <20190204132214.9459-1-chris@chris-wilson.co.uk> <20190204132214.9459-20-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9B196E05D for ; Mon, 4 Feb 2019 19:01:56 +0000 (UTC) In-Reply-To: <20190204132214.9459-20-chris@chris-wilson.co.uk> 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 Ck9uIDA0LzAyLzIwMTkgMTM6MjIsIENocmlzIFdpbHNvbiB3cm90ZToKPiBJbiB0aGUgbmV4dCBw YXRjaCwgd2UgYWRkIGFub3RoZXIgdXNlciB0aGF0IHdhbnRzIHRvIGNoZWNrIHdoZXRoZXIKPiBy ZXF1ZXN0cyBjYW4gYmUgbWVyZ2UgaW50byBhIHNpbmdsZSBIVyBleGVjdXRpb24sIGFuZCBpbiB0 aGUgZnV0dXJlIHdlCj4gd2FudCB0byBhZGQgbW9yZSBjb25kaXRpb25zIHVuZGVyIHdoaWNoIHJl cXVlc3RzIGZyb20gdGhlIHNhbWUgY29udGV4dAo+IGNhbm5vdCBiZSBtZXJnZS4gSW4gcHJlcGFy YXRpb24sIGV4dHJhY3Qgb3V0IGNhbl9tZXJnZV9ycSgpLgo+IAo+IHYyOiBSZW9yZGVyIHRlc3Rz IHRvIGRlY2lkZSBpZiB3ZSBjYW4gY29udGludWUgZmlsbGluZyBFTFNQIGFuZCBib251cwo+IGNv bW1lbnRzLgo+IAo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCAz NSArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDI0 IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCj4gaW5kZXggZTM3ZjIwN2FmYjVhLi42NmQ0NjU3MDhiYzYgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYwo+IEBAIC0yODUsMTIgKzI4NSwxMSBAQCBzdGF0aWMgaW5saW5lIGJvb2wg bmVlZF9wcmVlbXB0KGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKPiAgIH0K PiAgIAo+ICAgX19tYXliZV91bnVzZWQgc3RhdGljIGlubGluZSBib29sCj4gLWFzc2VydF9wcmlv cml0eV9xdWV1ZShjb25zdCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqZXhlY2xpc3Rz LAo+IC0JCSAgICAgIGNvbnN0IHN0cnVjdCBpOTE1X3JlcXVlc3QgKnByZXYsCj4gK2Fzc2VydF9w cmlvcml0eV9xdWV1ZShjb25zdCBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpwcmV2LAo+ICAgCQkgICAg ICBjb25zdCBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpuZXh0KQo+ICAgewo+IC0JaWYgKCFwcmV2KQo+ IC0JCXJldHVybiB0cnVlOwo+ICsJY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMg KmV4ZWNsaXN0cyA9Cj4gKwkJJnByZXYtPmVuZ2luZS0+ZXhlY2xpc3RzOwo+ICAgCj4gICAJLyoK PiAgIAkgKiBXaXRob3V0IHByZWVtcHRpb24sIHRoZSBwcmV2IG1heSByZWZlciB0byB0aGUgc3Rp bGwgYWN0aXZlIGVsZW1lbnQKPiBAQCAtNjAxLDYgKzYwMCwxNyBAQCBzdGF0aWMgYm9vbCBjYW5f bWVyZ2VfY3R4KGNvbnN0IHN0cnVjdCBpbnRlbF9jb250ZXh0ICpwcmV2LAo+ICAgCXJldHVybiB0 cnVlOwo+ICAgfQo+ICAgCj4gK3N0YXRpYyBib29sIGNhbl9tZXJnZV9ycShjb25zdCBzdHJ1Y3Qg aTkxNV9yZXF1ZXN0ICpwcmV2LAo+ICsJCQkgY29uc3Qgc3RydWN0IGk5MTVfcmVxdWVzdCAqbmV4 dCkKPiArewo+ICsJR0VNX0JVR19PTighYXNzZXJ0X3ByaW9yaXR5X3F1ZXVlKHByZXYsIG5leHQp KTsKPiArCj4gKwlpZiAoIWNhbl9tZXJnZV9jdHgocHJldi0+aHdfY29udGV4dCwgbmV4dC0+aHdf Y29udGV4dCkpCj4gKwkJcmV0dXJuIGZhbHNlOwo+ICsKPiArCXJldHVybiB0cnVlOwo+ICt9Cj4g Kwo+ICAgc3RhdGljIHZvaWQgcG9ydF9hc3NpZ24oc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQs IHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKQo+ICAgewo+ICAgCUdFTV9CVUdfT04ocnEgPT0gcG9y dF9yZXF1ZXN0KHBvcnQpKTsKPiBAQCAtNzUzLDggKzc2Myw2IEBAIHN0YXRpYyB2b2lkIGV4ZWNs aXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgIAkJaW50IGk7 Cj4gICAKPiAgIAkJcHJpb2xpc3RfZm9yX2VhY2hfcmVxdWVzdF9jb25zdW1lKHJxLCBybiwgcCwg aSkgewo+IC0JCQlHRU1fQlVHX09OKCFhc3NlcnRfcHJpb3JpdHlfcXVldWUoZXhlY2xpc3RzLCBs YXN0LCBycSkpOwo+IC0KPiAgIAkJCS8qCj4gICAJCQkgKiBDYW4gd2UgY29tYmluZSB0aGlzIHJl cXVlc3Qgd2l0aCB0aGUgY3VycmVudCBwb3J0Pwo+ICAgCQkJICogSXQgaGFzIHRvIGJlIHRoZSBz YW1lIGNvbnRleHQvcmluZ2J1ZmZlciBhbmQgbm90Cj4gQEAgLTc2Niw4ICs3NzQsNyBAQCBzdGF0 aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Cj4gICAJCQkgKiBzZWNvbmQgcmVxdWVzdCwgYW5kIHNvIHdlIG5ldmVyIG5lZWQgdG8gdGVsbCB0 aGUKPiAgIAkJCSAqIGhhcmR3YXJlIGFib3V0IHRoZSBmaXJzdC4KPiAgIAkJCSAqLwo+IC0JCQlp ZiAobGFzdCAmJgo+IC0JCQkgICAgIWNhbl9tZXJnZV9jdHgocnEtPmh3X2NvbnRleHQsIGxhc3Qt Pmh3X2NvbnRleHQpKSB7Cj4gKwkJCWlmIChsYXN0ICYmICFjYW5fbWVyZ2VfcnEobGFzdCwgcnEp KSB7Cj4gICAJCQkJLyoKPiAgIAkJCQkgKiBJZiB3ZSBhcmUgb24gdGhlIHNlY29uZCBwb3J0IGFu ZCBjYW5ub3QKPiAgIAkJCQkgKiBjb21iaW5lIHRoaXMgcmVxdWVzdCB3aXRoIHRoZSBsYXN0LCB0 aGVuIHdlCj4gQEAgLTc3Niw2ICs3ODMsMTQgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2RlcXVl dWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQo+ICAgCQkJCWlmIChwb3J0ID09IGxh c3RfcG9ydCkKPiAgIAkJCQkJZ290byBkb25lOwo+ICAgCj4gKwkJCQkvKgo+ICsJCQkJICogV2Ug bXVzdCBub3QgcG9wdWxhdGUgYm90aCBFTFNQW10gd2l0aCB0aGUKPiArCQkJCSAqIHNhbWUgTFJD QSwgaS5lLiB3ZSBtdXN0IHN1Ym1pdCAyIGRpZmZlcmVudAo+ICsJCQkJICogY29udGV4dHMgaWYg d2Ugc3VibWl0IDIgRUxTUC4KPiArCQkJCSAqLwo+ICsJCQkJaWYgKGxhc3QtPmh3X2NvbnRleHQg PT0gcnEtPmh3X2NvbnRleHQpCj4gKwkJCQkJZ290byBkb25lOwo+ICsKPiAgIAkJCQkvKgo+ICAg CQkJCSAqIElmIEdWVCBvdmVycmlkZXMgdXMgd2Ugb25seSBldmVyIHN1Ym1pdAo+ICAgCQkJCSAq IHBvcnRbMF0sIGxlYXZpbmcgcG9ydFsxXSBlbXB0eS4gTm90ZSB0aGF0IHdlCj4gQEAgLTc4Nyw3 ICs4MDIsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCj4gICAJCQkJICAgIGN0eF9zaW5nbGVfcG9ydF9zdWJtaXNzaW9uKHJx LT5od19jb250ZXh0KSkKPiAgIAkJCQkJZ290byBkb25lOwo+ICAgCj4gLQkJCQlHRU1fQlVHX09O KGxhc3QtPmh3X2NvbnRleHQgPT0gcnEtPmh3X2NvbnRleHQpOwo+ICAgCj4gICAJCQkJaWYgKHN1 Ym1pdCkKPiAgIAkJCQkJcG9ydF9hc3NpZ24ocG9ydCwgbGFzdCk7Cj4gQEAgLTgyNiw4ICs4NDAs NyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpCj4gICAJICogcmVxdWVzdCB0cmlnZ2VyaW5nIHByZWVtcHRpb24gb24gdGhlIG5l eHQgZGVxdWV1ZSAob3Igc3Vic2VxdWVudAo+ICAgCSAqIGludGVycnVwdCBmb3Igc2Vjb25kYXJ5 IHBvcnRzKS4KPiAgIAkgKi8KPiAtCWV4ZWNsaXN0cy0+cXVldWVfcHJpb3JpdHlfaGludCA9Cj4g LQkJcG9ydCAhPSBleGVjbGlzdHMtPnBvcnQgPyBycV9wcmlvKGxhc3QpIDogSU5UX01JTjsKPiAr CWV4ZWNsaXN0cy0+cXVldWVfcHJpb3JpdHlfaGludCA9IHF1ZXVlX3ByaW8oZXhlY2xpc3RzKTsK PiAgIAo+ICAgCWlmIChzdWJtaXQpIHsKPiAgIAkJcG9ydF9hc3NpZ24ocG9ydCwgbGFzdCk7Cj4g CgpSZXZpZXdlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K ClJlZ2FyZHMsCgpUdnJ0a28KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==