From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Harrison Subject: Re: [PATCH 5/5] drm/i915: Tidy batch pool logic Date: Fri, 13 Feb 2015 14:00:50 +0000 Message-ID: <54DE0392.7060809@Intel.com> References: <1421234459-21424-1-git-send-email-chris@chris-wilson.co.uk> <1421234459-21424-5-git-send-email-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id BED666E47D for ; Fri, 13 Feb 2015 06:00:53 -0800 (PST) In-Reply-To: <1421234459-21424-5-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Ck9uIDE0LzAxLzIwMTUgMTE6MjAsIENocmlzIFdpbHNvbiB3cm90ZToKPiBNb3ZlIHRoZSBtYWR2 aXNlIGxvZ2ljIG91dCBvZiB0aGUgZXhlY2J1ZmZlciBtYWluIHBhdGggaW50byB0aGUKPiByZWxh dGl2ZWx5IHJhcmUgYWxsb2NhdGlvbiBwYXRoLCBtYWtpbmcgdGhlIGV4ZWNidWZmZXIgbWFuaXB1 bGF0aW9uIGxlc3MKPiBmcmFnaWxlLgo+Cj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxj aHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2NtZF9wYXJzZXIuYyAgICAgfCAxMiArKystLS0tLS0tLS0KPiAgIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2JhdGNoX3Bvb2wuYyB8IDMxICsrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwg MTEgKysrLS0tLS0tLS0KPiAgIDMgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMzMg ZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9j bWRfcGFyc2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2NtZF9wYXJzZXIuYwo+IGlu ZGV4IDlhNmRhMzUzNmFlNS4uM2U1ZThjYjU0YTg4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9jbWRfcGFyc2VyLmMKPiBAQCAtODY2LDYgKzg2Niw5IEBAIHN0YXRpYyB1MzIgKmNvcHlf YmF0Y2goc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmRlc3Rfb2JqLAo+ICAgCSAgICBiYXRj aF9sZW4gKyBiYXRjaF9zdGFydF9vZmZzZXQgPiBzcmNfb2JqLT5iYXNlLnNpemUpCj4gICAJCXJl dHVybiBFUlJfUFRSKC1FMkJJRyk7Cj4gICAKPiArCWlmIChXQVJOX09OKGRlc3Rfb2JqLT5wYWdl c19waW5fY291bnQgPT0gMCkpCj4gKwkJcmV0dXJuIEVSUl9QVFIoLUVOT0RFVik7Cj4gKwo+ICAg CXJldCA9IGk5MTVfZ2VtX29ial9wcmVwYXJlX3NobWVtX3JlYWQoc3JjX29iaiwgJm5lZWRzX2Ns Zmx1c2gpOwo+ICAgCWlmIChyZXQpIHsKPiAgIAkJRFJNX0RFQlVHX0RSSVZFUigiQ01EOiBmYWls ZWQgdG8gcHJlcGFyZSBzaGFkb3cgYmF0Y2hcbiIpOwo+IEBAIC04NzksMTMgKzg4Miw2IEBAIHN0 YXRpYyB1MzIgKmNvcHlfYmF0Y2goc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmRlc3Rfb2Jq LAo+ICAgCQlnb3RvIHVucGluX3NyYzsKPiAgIAl9Cj4gICAKPiAtCXJldCA9IGk5MTVfZ2VtX29i amVjdF9nZXRfcGFnZXMoZGVzdF9vYmopOwo+IC0JaWYgKHJldCkgewo+IC0JCURSTV9ERUJVR19E UklWRVIoIkNNRDogRmFpbGVkIHRvIGdldCBwYWdlcyBmb3Igc2hhZG93IGJhdGNoXG4iKTsKPiAt CQlnb3RvIHVubWFwX3NyYzsKPiAtCX0KPiAtCWk5MTVfZ2VtX29iamVjdF9waW5fcGFnZXMoZGVz dF9vYmopOwo+IC0KPiAgIAlyZXQgPSBpOTE1X2dlbV9vYmplY3Rfc2V0X3RvX2NwdV9kb21haW4o ZGVzdF9vYmosIHRydWUpOwo+ICAgCWlmIChyZXQpIHsKPiAgIAkJRFJNX0RFQlVHX0RSSVZFUigi Q01EOiBGYWlsZWQgdG8gc2V0IHNoYWRvdyBiYXRjaCB0byBDUFVcbiIpOwo+IEBAIC04OTUsNyAr ODkxLDYgQEAgc3RhdGljIHUzMiAqY29weV9iYXRjaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqZGVzdF9vYmosCj4gICAJZHN0ID0gdm1hcF9iYXRjaChkZXN0X29iaiwgMCwgYmF0Y2hfbGVu KTsKPiAgIAlpZiAoIWRzdCkgewo+ICAgCQlEUk1fREVCVUdfRFJJVkVSKCJDTUQ6IEZhaWxlZCB0 byB2bWFwIHNoYWRvdyBiYXRjaFxuIik7Cj4gLQkJaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2Vz KGRlc3Rfb2JqKTsKPiAgIAkJcmV0ID0gLUVOT01FTTsKPiAgIAkJZ290byB1bm1hcF9zcmM7Cj4g ICAJfQo+IEBAIC0xMTI2LDcgKzExMjEsNiBAQCBpbnQgaTkxNV9wYXJzZV9jbWRzKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcsCj4gICAJfQo+ICAgCj4gICAJdnVubWFwKGJhdGNoX2Jhc2Up Owo+IC0JaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKHNoYWRvd19iYXRjaF9vYmopOwo+ICAg Cj4gICAJcmV0dXJuIHJldDsKPiAgIH0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f YmF0Y2hfcG9vbC5jCj4gaW5kZXggYzY5MDE3MGExYzRmLi5lNWM4OGRkZDg0NTIgMTAwNjQ0Cj4g LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fYmF0Y2hfcG9vbC5jCj4gQEAgLTY2LDkgKzY2 LDcgQEAgdm9pZCBpOTE1X2dlbV9iYXRjaF9wb29sX2Zpbmkoc3RydWN0IGk5MTVfZ2VtX2JhdGNo X3Bvb2wgKnBvb2wpCj4gICAJCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCwKPiAgIAkJ CQkJIGJhdGNoX3Bvb2xfbGlzdCk7Cj4gICAKPiAtCQlXQVJOX09OKG9iai0+YWN0aXZlKTsKPiAt Cj4gLQkJbGlzdF9kZWxfaW5pdCgmb2JqLT5iYXRjaF9wb29sX2xpc3QpOwo+ICsJCWxpc3RfZGVs KCZvYmotPmJhdGNoX3Bvb2xfbGlzdCk7Cj4gICAJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNl KCZvYmotPmJhc2UpOwo+ICAgCX0KPiAgIH0KPiBAQCAtOTYsMTAgKzk0LDkgQEAgaTkxNV9nZW1f YmF0Y2hfcG9vbF9nZXQoc3RydWN0IGk5MTVfZ2VtX2JhdGNoX3Bvb2wgKnBvb2wsCj4gICAJV0FS Tl9PTighbXV0ZXhfaXNfbG9ja2VkKCZwb29sLT5kZXYtPnN0cnVjdF9tdXRleCkpOwo+ICAgCj4g ICAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHRtcCwgbmV4dCwKPiAtCQkJJnBvb2wtPmNhY2hl X2xpc3QsIGJhdGNoX3Bvb2xfbGlzdCkgewo+IC0KPiArCQkJCSAmcG9vbC0+Y2FjaGVfbGlzdCwg YmF0Y2hfcG9vbF9saXN0KSB7Cj4gICAJCWlmICh0bXAtPmFjdGl2ZSkKPiAtCQkJY29udGludWU7 Cj4gKwkJCWJyZWFrOwo+ICAgCj4gICAJCS8qIFdoaWxlIHdlJ3JlIGxvb3BpbmcsIGRvIHNvbWUg Y2xlYW4gdXAgKi8KPiAgIAkJaWYgKHRtcC0+bWFkdiA9PSBfX0k5MTVfTUFEVl9QVVJHRUQpIHsK PiBAQCAtMTEzLDI1ICsxMTAsMjcgQEAgaTkxNV9nZW1fYmF0Y2hfcG9vbF9nZXQoc3RydWN0IGk5 MTVfZ2VtX2JhdGNoX3Bvb2wgKnBvb2wsCj4gICAJCSAqIGJ1dCBub3QgJ3RvbyBtdWNoJyBiaWdn ZXIuIEEgYmV0dGVyIHdheSB0byBkbyB0aGlzCj4gICAJCSAqIG1pZ2h0IGJlIHRvIGJ1Y2tldCB0 aGUgcG9vbCBvYmplY3RzIGJhc2VkIG9uIHNpemUuCj4gICAJCSAqLwo+IC0JCWlmICh0bXAtPmJh c2Uuc2l6ZSA+PSBzaXplICYmCj4gLQkJICAgIHRtcC0+YmFzZS5zaXplIDw9ICgyICogc2l6ZSkp IHsKPiArCQlpZiAodG1wLT5iYXNlLnNpemUgPj0gc2l6ZSAmJiB0bXAtPmJhc2Uuc2l6ZSA8PSAy ICogc2l6ZSkgewo+ICAgCQkJb2JqID0gdG1wOwo+ICAgCQkJYnJlYWs7Cj4gICAJCX0KPiAgIAl9 Cj4gICAKPiAtCWlmICghb2JqKSB7Cj4gKwlpZiAob2JqID09IE5VTEwpIHsKPiArCQlpbnQgcmV0 Owo+ICsKPiAgIAkJb2JqID0gaTkxNV9nZW1fYWxsb2Nfb2JqZWN0KHBvb2wtPmRldiwgc2l6ZSk7 Cj4gLQkJaWYgKCFvYmopCj4gKwkJaWYgKG9iaiA9PSBOVUxMKQo+ICAgCQkJcmV0dXJuIEVSUl9Q VFIoLUVOT01FTSk7Cj4gICAKPiAtCQlsaXN0X2FkZF90YWlsKCZvYmotPmJhdGNoX3Bvb2xfbGlz dCwgJnBvb2wtPmNhY2hlX2xpc3QpOwo+IC0JfQo+IC0JZWxzZQo+IC0JCS8qIEtlZXAgbGlzdCBp biBMUlUgb3JkZXIgKi8KPiAtCQlsaXN0X21vdmVfdGFpbCgmb2JqLT5iYXRjaF9wb29sX2xpc3Qs ICZwb29sLT5jYWNoZV9saXN0KTsKPiArCQlyZXQgPSBpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2Vz KG9iaik7Cj4gKwkJaWYgKHJldCkKPiArCQkJcmV0dXJuIEVSUl9QVFIocmV0KTsKPiAgIAo+IC0J b2JqLT5tYWR2ID0gSTkxNV9NQURWX1dJTExORUVEOwo+ICsJCW9iai0+bWFkdiA9IEk5MTVfTUFE Vl9ET05UTkVFRDsKPiArCX0KPiAgIAo+ICsJbGlzdF9tb3ZlX3RhaWwoJm9iai0+YmF0Y2hfcG9v bF9saXN0LCAmcG9vbC0+Y2FjaGVfbGlzdCk7CldoeSBpcyBpdCBub3cgc2FmZSB0byBkbyBhIG1v dmVfdGFpbCBpbnN0ZWFkIG9mIGFkZF90YWlsIGlmIHRoZSBub2RlIGhhcyAKanVzdCBiZWVuIGFs bG9jYXRlZD8gV2FzIHRoZSBvcmlnaW5hbCBhZGRfdGFpbCgpIHdyb25nIG9yIGFtIEkgbm90IApz cG90dGluZyBzb21lIGNyaXRpY2FsIGRpZmZlcmVuY2UgdG8gaG93IG5ldyBwb29sIG9iamVjdHMg YXJlIGNyZWF0ZWQ/Cj4gKwlpOTE1X2dlbV9vYmplY3RfcGluX3BhZ2VzKG9iaik7CklzIGl0IHdv cnRoIHVwZGF0aW5nIHRoZSBmdW5jdGlvbiBkZXNjcmlwdGlvbiBjb21tZW50IHRvIGFkZCBhIGxp bmUgCmFib3V0IHRoZSByZXR1cm5lZCBidWZmZXIgbm93IGJlaW5nIHBpbm5lZCBhbmQgdGhlIGNh bGxlciBtdXN0IHdvcnJ5IAphYm91dCB1bnBpbm5pbmcgaXQ/Cgo+ICAgCXJldHVybiBvYmo7Cj4g ICB9Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZm ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwo+IGluZGV4 IDNmYmQ1MjEyMjI1Zi4uNjM1N2YwMWU2YzQ2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwo+IEBAIC0zNyw3ICszNyw2IEBACj4gICAjZGVmaW5lICBf X0VYRUNfT0JKRUNUX0hBU19GRU5DRSAoMTw8MzApCj4gICAjZGVmaW5lICBfX0VYRUNfT0JKRUNU X05FRURTX01BUCAoMTw8MjkpCj4gICAjZGVmaW5lICBfX0VYRUNfT0JKRUNUX05FRURTX0JJQVMg KDE8PDI4KQo+IC0jZGVmaW5lICBfX0VYRUNfT0JKRUNUX1BVUkdFQUJMRSAoMTw8MjcpCj4gICAK PiAgICNkZWZpbmUgQkFUQ0hfT0ZGU0VUX0JJQVMgKDI1NioxMDI0KQo+ICAgCj4gQEAgLTIyNCwx MiArMjIzLDcgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl91bnJlc2VydmVfdm1hKHN0cnVjdCBpOTE1 X3ZtYSAqdm1hKQo+ICAgCWlmIChlbnRyeS0+ZmxhZ3MgJiBfX0VYRUNfT0JKRUNUX0hBU19QSU4p Cj4gICAJCXZtYS0+cGluX2NvdW50LS07Cj4gICAKPiAtCWlmIChlbnRyeS0+ZmxhZ3MgJiBfX0VY RUNfT0JKRUNUX1BVUkdFQUJMRSkKPiAtCQlvYmotPm1hZHYgPSBJOTE1X01BRFZfRE9OVE5FRUQ7 Cj4gLQo+IC0JZW50cnktPmZsYWdzICY9IH4oX19FWEVDX09CSkVDVF9IQVNfRkVOQ0UgfAo+IC0J CQkgIF9fRVhFQ19PQkpFQ1RfSEFTX1BJTiB8Cj4gLQkJCSAgX19FWEVDX09CSkVDVF9QVVJHRUFC TEUpOwo+ICsJZW50cnktPmZsYWdzICY9IH4oX19FWEVDX09CSkVDVF9IQVNfRkVOQ0UgfCBfX0VY RUNfT0JKRUNUX0hBU19QSU4pOwo+ICAgfQo+ICAgCj4gICBzdGF0aWMgdm9pZCBlYl9kZXN0cm95 KHN0cnVjdCBlYl92bWFzICplYikKPiBAQCAtMTE1NCw2ICsxMTQ4LDcgQEAgaTkxNV9nZW1fZXhl Y2J1ZmZlcl9wYXJzZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAo+ICAgCQkJICAgICAg YmF0Y2hfc3RhcnRfb2Zmc2V0LAo+ICAgCQkJICAgICAgYmF0Y2hfbGVuLAo+ICAgCQkJICAgICAg aXNfbWFzdGVyKTsKPiArCWk5MTVfZ2VtX29iamVjdF91bnBpbl9wYWdlcyhzaGFkb3dfYmF0Y2hf b2JqKTsKPiAgIAlpZiAocmV0KQo+ICAgCQlnb3RvIGVycjsKPiAgIAo+IEBAIC0xMTY1LDcgKzEx NjAsNyBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX3BhcnNlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCj4gICAKPiAgIAl2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChzaGFkb3dfYmF0Y2hf b2JqKTsKPiAgIAl2bWEtPmV4ZWNfZW50cnkgPSBzaGFkb3dfZXhlY19lbnRyeTsKPiAtCXZtYS0+ ZXhlY19lbnRyeS0+ZmxhZ3MgPSBfX0VYRUNfT0JKRUNUX1BVUkdFQUJMRSB8IF9fRVhFQ19PQkpF Q1RfSEFTX1BJTjsKPiArCXZtYS0+ZXhlY19lbnRyeS0+ZmxhZ3MgPSBfX0VYRUNfT0JKRUNUX0hB U19QSU47Cj4gICAJZHJtX2dlbV9vYmplY3RfcmVmZXJlbmNlKCZzaGFkb3dfYmF0Y2hfb2JqLT5i YXNlKTsKPiAgIAlsaXN0X2FkZF90YWlsKCZ2bWEtPmV4ZWNfbGlzdCwgJmViLT52bWFzKTsKPiAg IAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK