From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: Re: [PATCH 22/37] drm/i915: Move common scratch allocation/destroy to intel_engine_cs.c Date: Fri, 12 Aug 2016 11:40:37 +0300 Message-ID: <1470991237.3709.18.camel@linux.intel.com> References: <1470984867-7132-1-git-send-email-chris@chris-wilson.co.uk> <1470984867-7132-22-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id B0B656EACE for ; Fri, 12 Aug 2016 08:40:41 +0000 (UTC) In-Reply-To: <1470984867-7132-22-git-send-email-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: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gcGUsIDIwMTYtMDgtMTIgYXQgMDc6NTQgKzAxMDAsIENocmlzIFdpbHNvbiB3cm90ZToKPiBT aW5jZSB0aGUgc2NyYXRjaCBhbGxvY2F0aW9uIGFuZCBjbGVhbnVwIGlzIHNoYXJlZCBieSBhbGwg ZW5naW5lCj4gc3VibWlzc2lvbiBiYWNrZW5kcywgbW92ZSBpdCBvdXQgb2YgdGhlIGxlZ2FjeSBp bnRlbF9yaW5nYnVmZmVyLmMgYW5kCj4gaW50byB0aGUgbmV3IGhvbWUgZm9yIGNvbW1vbiByb3V0 aW5lcywgaW50ZWxfZW5naW5lX2NzLmMKPiAKPiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPiBSZXZpZXdlZC1ieTogTWF0dGhldyBBdWxkIDxt YXR0aGV3LmF1bGRAaW50ZWwuY29tPgoKSG1tLCBkaWQgbm90IGdldCBteSBlLW1haWw/CgpSZXZp ZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29t PgoKPiAtLS0KPiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jwqDCoHwg NTAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4gwqBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuY8KgwqDCoMKgwqDCoMKgwqB8wqDCoDEgLQo+IMKgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNTAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCj4gwqBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfMKg wqA0ICstLQo+IMKgNCBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCA1NCBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5l X2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwo+IGluZGV4IDE4 NmMxMmQwN2Y5OS4uNzEwNGRlYzVlODkzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2VuZ2luZV9jcy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZW5naW5lX2NzLmMKPiBAQCAtMTk1LDYgKzE5NSw1NCBAQCB2b2lkIGludGVsX2VuZ2luZV9zZXR1 cF9jb21tb24oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQo+IMKgCWk5MTVfZ2VtX2Jh dGNoX3Bvb2xfaW5pdChlbmdpbmUsICZlbmdpbmUtPmJhdGNoX3Bvb2wpOwo+IMKgfQo+IMKgCj4g K2ludCBpbnRlbF9lbmdpbmVfY3JlYXRlX3NjcmF0Y2goc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lLCBpbnQgc2l6ZSkKPiArewo+ICsJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i ajsKPiArCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwo+ICsJaW50IHJldDsKPiArCj4gKwlXQVJOX09O KGVuZ2luZS0+c2NyYXRjaCk7Cj4gKwo+ICsJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZV9z dG9sZW4oJmVuZ2luZS0+aTkxNS0+ZHJtLCBzaXplKTsKPiArCWlmICghb2JqKQo+ICsJCW9iaiA9 IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoJmVuZ2luZS0+aTkxNS0+ZHJtLCBzaXplKTsKPiArCWlm IChJU19FUlIob2JqKSkgewo+ICsJCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIHNjcmF0 Y2ggcGFnZVxuIik7Cj4gKwkJcmV0dXJuIFBUUl9FUlIob2JqKTsKPiArCX0KPiArCj4gKwl2bWEg PSBpOTE1X3ZtYV9jcmVhdGUob2JqLCAmZW5naW5lLT5pOTE1LT5nZ3R0LmJhc2UsIE5VTEwpOwo+ ICsJaWYgKElTX0VSUih2bWEpKSB7Cj4gKwkJcmV0ID0gUFRSX0VSUih2bWEpOwo+ICsJCWdvdG8g ZXJyX3VucmVmOwo+ICsJfQo+ICsKPiArCXJldCA9IGk5MTVfdm1hX3Bpbih2bWEsIDAsIDQwOTYs IFBJTl9HTE9CQUwgfCBQSU5fSElHSCk7Cj4gKwlpZiAocmV0KQo+ICsJCWdvdG8gZXJyX3VucmVm Owo+ICsKPiArCWVuZ2luZS0+c2NyYXRjaCA9IHZtYTsKPiArCURSTV9ERUJVR19EUklWRVIoIiVz IHBpcGUgY29udHJvbCBvZmZzZXQ6IDB4JTA4bGx4XG4iLAo+ICsJCQnCoGVuZ2luZS0+bmFtZSwg dm1hLT5ub2RlLnN0YXJ0KTsKPiArCXJldHVybiAwOwo+ICsKPiArZXJyX3VucmVmOgo+ICsJaTkx NV9nZW1fb2JqZWN0X3B1dChvYmopOwo+ICsJcmV0dXJuIHJldDsKPiArfQo+ICsKPiArc3RhdGlj IHZvaWQgaW50ZWxfZW5naW5lX2NsZWFudXBfc2NyYXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpCj4gK3sKPiArCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwo+ICsKPiArCXZtYSA9IGZl dGNoX2FuZF96ZXJvKCZlbmdpbmUtPnNjcmF0Y2gpOwo+ICsJaWYgKCF2bWEpCj4gKwkJcmV0dXJu Owo+ICsKPiArCWk5MTVfdm1hX3VucGluKHZtYSk7Cj4gKwlpOTE1X3ZtYV9wdXQodm1hKTsKPiAr fQo+ICsKPiDCoC8qKgo+IMKgICogaW50ZWxfZW5naW5lc19pbml0X2NvbW1vbiAtIGluaXRpYWxp emUgY2VuZ2luZSBzdGF0ZSB3aGljaCBtaWdodCByZXF1aXJlIGh3IGFjY2Vzcwo+IMKgICogQGVu Z2luZTogRW5naW5lIHRvIGluaXRpYWxpemUuCj4gQEAgLTIyNiw2ICsyNzQsOCBAQCBpbnQgaW50 ZWxfZW5naW5lX2luaXRfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiDC oCAqLwo+IMKgdm9pZCBpbnRlbF9lbmdpbmVfY2xlYW51cF9jb21tb24oc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQo+IMKgewo+ICsJaW50ZWxfZW5naW5lX2NsZWFudXBfc2NyYXRjaChl bmdpbmUpOwo+ICsKPiDCoAlpbnRlbF9lbmdpbmVfY2xlYW51cF9jbWRfcGFyc2VyKGVuZ2luZSk7 Cj4gwqAJaW50ZWxfZW5naW5lX2ZpbmlfYnJlYWRjcnVtYnMoZW5naW5lKTsKPiDCoAlpOTE1X2dl bV9iYXRjaF9wb29sX2ZpbmkoJmVuZ2luZS0+YmF0Y2hfcG9vbCk7Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKPiBpbmRleCBjZGNkZWM4M2Q2NDAuLjg4YmM1ZDRjZTI0MyAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCj4gQEAgLTE4NDQsNyArMTg0NCw2IEBAIGludCBsb2dpY2FsX3Jl bmRlcl9yaW5nX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQo+IMKgCWVsc2UK PiDCoAkJZW5naW5lLT5pbml0X2h3ID0gZ2VuOF9pbml0X3JlbmRlcl9yaW5nOwo+IMKgCWVuZ2lu ZS0+aW5pdF9jb250ZXh0ID0gZ2VuOF9pbml0X3Jjc19jb250ZXh0Owo+IC0JZW5naW5lLT5jbGVh bnVwID0gaW50ZWxfZW5naW5lX2NsZWFudXBfc2NyYXRjaDsKPiDCoAllbmdpbmUtPmVtaXRfZmx1 c2ggPSBnZW44X2VtaXRfZmx1c2hfcmVuZGVyOwo+IMKgCWVuZ2luZS0+ZW1pdF9yZXF1ZXN0ID0g Z2VuOF9lbWl0X3JlcXVlc3RfcmVuZGVyOwo+IMKgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYwo+IGluZGV4IDkzOTYzMjIyOTMyMC4uMGVjZGQ0NTJhN2Y3IDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwo+IEBAIC02MTMsNTQgKzYxMyw2 IEBAIG91dDoKPiDCoAlyZXR1cm4gcmV0Owo+IMKgfQo+IMKgCj4gLXZvaWQgaW50ZWxfZW5naW5l X2NsZWFudXBfc2NyYXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCj4gLXsKPiAt CXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwo+IC0KPiAtCXZtYSA9IGZldGNoX2FuZF96ZXJvKCZlbmdp bmUtPnNjcmF0Y2gpOwo+IC0JaWYgKCF2bWEpCj4gLQkJcmV0dXJuOwo+IC0KPiAtCWk5MTVfdm1h X3VucGluKHZtYSk7Cj4gLQlpOTE1X3ZtYV9wdXQodm1hKTsKPiAtfQo+IC0KPiAtaW50IGludGVs X2VuZ2luZV9jcmVhdGVfc2NyYXRjaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGlu dCBzaXplKQo+IC17Cj4gLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwo+IC0Jc3Ry dWN0IGk5MTVfdm1hICp2bWE7Cj4gLQlpbnQgcmV0Owo+IC0KPiAtCVdBUk5fT04oZW5naW5lLT5z Y3JhdGNoKTsKPiAtCj4gLQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlX3N0b2xlbigmZW5n aW5lLT5pOTE1LT5kcm0sIHNpemUpOwo+IC0JaWYgKCFvYmopCj4gLQkJb2JqID0gaTkxNV9nZW1f b2JqZWN0X2NyZWF0ZSgmZW5naW5lLT5pOTE1LT5kcm0sIHNpemUpOwo+IC0JaWYgKElTX0VSUihv YmopKSB7Cj4gLQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUgc2NyYXRjaCBwYWdlXG4i KTsKPiAtCQlyZXR1cm4gUFRSX0VSUihvYmopOwo+IC0JfQo+IC0KPiAtCXZtYSA9IGk5MTVfdm1h X2NyZWF0ZShvYmosICZlbmdpbmUtPmk5MTUtPmdndHQuYmFzZSwgTlVMTCk7Cj4gLQlpZiAoSVNf RVJSKHZtYSkpIHsKPiAtCQlyZXQgPSBQVFJfRVJSKHZtYSk7Cj4gLQkJZ290byBlcnJfdW5yZWY7 Cj4gLQl9Cj4gLQo+IC0JcmV0ID0gaTkxNV92bWFfcGluKHZtYSwgMCwgNDA5NiwgUElOX0dMT0JB TCB8IFBJTl9ISUdIKTsKPiAtCWlmIChyZXQpCj4gLQkJZ290byBlcnJfdW5yZWY7Cj4gLQo+IC0J ZW5naW5lLT5zY3JhdGNoID0gdm1hOwo+IC0JRFJNX0RFQlVHX0RSSVZFUigiJXMgcGlwZSBjb250 cm9sIG9mZnNldDogMHglMDhsbHhcbiIsCj4gLQkJCcKgZW5naW5lLT5uYW1lLCB2bWEtPm5vZGUu c3RhcnQpOwo+IC0JcmV0dXJuIDA7Cj4gLQo+IC1lcnJfdW5yZWY6Cj4gLQlpOTE1X2dlbV9vYmpl Y3RfcHV0KG9iaik7Cj4gLQlyZXR1cm4gcmV0Owo+IC19Cj4gLQo+IMKgc3RhdGljIGludCBpbnRl bF9yaW5nX3dvcmthcm91bmRzX2VtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEp Cj4gwqB7Cj4gwqAJc3RydWN0IGludGVsX3JpbmcgKnJpbmcgPSByZXEtPnJpbmc7Cj4gQEAgLTEz MTEsOCArMTI2Myw2IEBAIHN0YXRpYyB2b2lkIHJlbmRlcl9yaW5nX2NsZWFudXAoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKQo+IMKgCQlpOTE1X2dlbV9vYmplY3RfcHV0KGRldl9wcml2 LT5zZW1hcGhvcmVfb2JqKTsKPiDCoAkJZGV2X3ByaXYtPnNlbWFwaG9yZV9vYmogPSBOVUxMOwo+ IMKgCX0KPiAtCj4gLQlpbnRlbF9lbmdpbmVfY2xlYW51cF9zY3JhdGNoKGVuZ2luZSk7Cj4gwqB9 Cj4gwqAKPiDCoHN0YXRpYyBpbnQgZ2VuOF9yY3Nfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxKQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKPiBp bmRleCBjNjAyNGRiNzVmOTMuLmRjYTg0MjU4YmUxNiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKPiBAQCAtNDcyLDExICs0NzIsOSBAQCB2b2lkIGludGVsX3Jp bmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKTsKPiDCoAo+IMKgdm9pZCBp bnRlbF9lbmdpbmVfaW5pdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIHUz MiBzZXFubyk7Cj4gwqAKPiAtaW50IGludGVsX2VuZ2luZV9jcmVhdGVfc2NyYXRjaChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGludCBzaXplKTsKPiAtdm9pZCBpbnRlbF9lbmdpbmVf Y2xlYW51cF9zY3JhdGNoKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7Cj4gLQo+IMKg dm9pZCBpbnRlbF9lbmdpbmVfc2V0dXBfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSk7Cj4gwqBpbnQgaW50ZWxfZW5naW5lX2luaXRfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSk7Cj4gK2ludCBpbnRlbF9lbmdpbmVfY3JlYXRlX3NjcmF0Y2goc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQgc2l6ZSk7Cj4gwqB2b2lkIGludGVsX2VuZ2lu ZV9jbGVhbnVwX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwo+IMKgCj4g wqBzdGF0aWMgaW5saW5lIGludCBpbnRlbF9lbmdpbmVfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCi0tIApKb29uYXMgTGFodGluZW4KT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBD ZW50ZXIKSW50ZWwgQ29ycG9yYXRpb24KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==