From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 2/2] drm/i915: Generalise wait for execlists to be idle Date: Fri, 03 Mar 2017 14:55:42 +0200 Message-ID: <87tw7aa59t.fsf@gaia.fi.intel.com> References: <20170303121947.20482-1-chris@chris-wilson.co.uk> <20170303121947.20482-2-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A75E6ED04 for ; Fri, 3 Mar 2017 12:57:36 +0000 (UTC) In-Reply-To: <20170303121947.20482-2-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 Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gVGhlIGNv ZGUgdG8gY2hlY2sgZm9yIGV4ZWNsaXN0cyBjb21wbGV0aW9uIGlzIGdlbmVyaWMsIHNvIG1vdmUg aXQgdG8KPiBpbnRlbF9lbmdpbmVfY3MuYwo+Cj4gU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpSZXZpZXdlZC1ieTogTWlrYSBLdW9wcGFsYSA8 bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Cgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jICAgICAgICAgICAgICAgICAgIHwgIDggKysrLS0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyAgICAgICAgICAgIHwgMTMgKysrKysrKysrKysKPiAg ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgICAgICAgICB8IDI4IC0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5o ICAgICAgICAgICAgICAgICAgfCAgMSAtCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaCAgICAgICAgICAgfCAgMSArCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0 ZXN0cy9pOTE1X2dlbV9yZXF1ZXN0LmMgfCAgMiArLQo+ICA2IGZpbGVzIGNoYW5nZWQsIDE5IGlu c2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4g aW5kZXggNWVmYjE4YTIyOWNjLi43YzIwNjAxZmUxZGUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMKPiBAQCAtMjk1OSw4ICsyOTU5LDggQEAgaTkxNV9nZW1faWRsZV93b3JrX2hhbmRsZXIo c3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ICAJICogbmV3IHJlcXVlc3QgaXMgc3VibWl0dGVk Lgo+ICAJICovCj4gIAl3YWl0X2ZvcihSRUFEX09OQ0UoZGV2X3ByaXYtPmd0LmFjdGl2ZV9yZXF1 ZXN0cykgfHwKPiAtCQkgaW50ZWxfZXhlY2xpc3RzX2lkbGUoZGV2X3ByaXYpLCAxMCk7Cj4gLQo+ ICsJCSBpbnRlbF9lbmdpbmVzX2FyZV9pZGxlKGRldl9wcml2KSwKPiArCQkgMTApOwo+ICAJaWYg KFJFQURfT05DRShkZXZfcHJpdi0+Z3QuYWN0aXZlX3JlcXVlc3RzKSkKPiAgCQlyZXR1cm47Cj4g IAo+IEBAIC0yOTg1LDcgKzI5ODUsNyBAQCBpOTE1X2dlbV9pZGxlX3dvcmtfaGFuZGxlcihzdHJ1 Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gIAlpZiAoZGV2X3ByaXYtPmd0LmFjdGl2ZV9yZXF1ZXN0 cykKPiAgCQlnb3RvIG91dF91bmxvY2s7Cj4gIAo+IC0JaWYgKHdhaXRfZm9yKGludGVsX2V4ZWNs aXN0c19pZGxlKGRldl9wcml2KSwgMTApKQo+ICsJaWYgKHdhaXRfZm9yKGludGVsX2VuZ2luZXNf YXJlX2lkbGUoZGV2X3ByaXYpLCAxMCkpCj4gIAkJRFJNX0VSUk9SKCJUaW1lb3V0IHdhaXRpbmcg Zm9yIGVuZ2luZXMgdG8gaWRsZVxuIik7Cj4gIAo+ICAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg ZGV2X3ByaXYsIGlkKSB7Cj4gQEAgLTQyODcsNyArNDI4Nyw3IEBAIGludCBpOTE1X2dlbV9zdXNw ZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgCSAqIHJlc2V0IHRoZSBH UFUgYmFjayB0byBpdHMgaWRsZSwgbG93IHBvd2VyIHN0YXRlLgo+ICAJICovCj4gIAlXQVJOX09O KGRldl9wcml2LT5ndC5hd2FrZSk7Cj4gLQlXQVJOX09OKCFpbnRlbF9leGVjbGlzdHNfaWRsZShk ZXZfcHJpdikpOwo+ICsJV0FSTl9PTighaW50ZWxfZW5naW5lc19hcmVfaWRsZShkZXZfcHJpdikp Owo+ICAKPiAgCS8qCj4gIAkgKiBOZWl0aGVyIHRoZSBCSU9TLCBvdXJzZWx2ZXMgb3IgYW55IG90 aGVyIGtlcm5lbAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdp bmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCj4gaW5kZXgg NTNkNjVkYzBjOWZiLi41ZmQ0ODgzZGIyMzUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9lbmdpbmVfY3MuYwo+IEBAIC0xMTAyLDYgKzExMDIsMTkgQEAgYm9vbCBpbnRlbF9lbmdpbmVf aXNfaWRsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCj4gIAlyZXR1cm4gdHJ1ZTsK PiAgfQo+ICAKPiArYm9vbCBpbnRlbF9lbmdpbmVzX2FyZV9pZGxlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKPiArewo+ICsJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l Owo+ICsJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7Cj4gKwo+ICsJZm9yX2VhY2hfZW5naW5lKGVu Z2luZSwgZGV2X3ByaXYsIGlkKSB7Cj4gKwkJaWYgKCFpbnRlbF9lbmdpbmVfaXNfaWRsZShlbmdp bmUpKQo+ICsJCQlyZXR1cm4gZmFsc2U7Cj4gKwl9Cj4gKwo+ICsJcmV0dXJuIHRydWU7Cj4gK30K PiArCj4gICNpZiBJU19FTkFCTEVEKENPTkZJR19EUk1fSTkxNV9TRUxGVEVTVCkKPiAgI2luY2x1 ZGUgInNlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jIgo+ICAjZW5kaWYKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYwo+IGluZGV4IGY5YTg1NDU0NzRiYy4uMzgzNGE4NGZlMDg0IDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKPiBAQCAtNDk4LDM0ICs0OTgsNiBAQCBzdGF0aWMgYm9vbCBleGVj bGlzdHNfZWxzcF9pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgCXJldHVy biAhZW5naW5lLT5leGVjbGlzdF9wb3J0WzBdLnJlcXVlc3Q7Cj4gIH0KPiAgCj4gLS8qKgo+IC0g KiBpbnRlbF9leGVjbGlzdHNfaWRsZSgpIC0gRGV0ZXJtaW5lIGlmIGFsbCBlbmdpbmUgc3VibWlz c2lvbiBwb3J0cyBhcmUgaWRsZQo+IC0gKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlIHByaXZhdGUK PiAtICoKPiAtICogUmV0dXJuIHRydWUgaWYgdGhlcmUgYXJlIG5vIHJlcXVlc3RzIHBlbmRpbmcg b24gYW55IG9mIHRoZSBzdWJtaXNzaW9uIHBvcnRzCj4gLSAqIG9mIGFueSBlbmdpbmVzLgo+IC0g Ki8KPiAtYm9vbCBpbnRlbF9leGVjbGlzdHNfaWRsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCj4gLXsKPiAtCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKPiAtCWVu dW0gaW50ZWxfZW5naW5lX2lkIGlkOwo+IC0KPiAtCWlmICghaTkxNS5lbmFibGVfZXhlY2xpc3Rz KQo+IC0JCXJldHVybiB0cnVlOwo+IC0KPiAtCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9w cml2LCBpZCkgewo+IC0JCS8qIEludGVycnVwdC90YXNrbGV0IHBlbmRpbmc/ICovCj4gLQkJaWYg KHRlc3RfYml0KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZlbmdpbmUtPmlycV9wb3N0ZWQpKQo+IC0J CQlyZXR1cm4gZmFsc2U7Cj4gLQo+IC0JCS8qIEJvdGggcG9ydHMgZHJhaW5lZCwgbm8gbW9yZSBF TFNQIHN1Ym1pc3Npb24/ICovCj4gLQkJaWYgKCFleGVjbGlzdHNfZWxzcF9pZGxlKGVuZ2luZSkp Cj4gLQkJCXJldHVybiBmYWxzZTsKPiAtCX0KPiAtCj4gLQlyZXR1cm4gdHJ1ZTsKPiAtfQo+IC0K PiAgc3RhdGljIGJvb2wgZXhlY2xpc3RzX2Vsc3BfcmVhZHkoY29uc3Qgc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQo+ICB7Cj4gIAljb25zdCBzdHJ1Y3QgZXhlY2xpc3RfcG9ydCAqcG9y dCA9IGVuZ2luZS0+ZXhlY2xpc3RfcG9ydDsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAo+IGlu ZGV4IGM4MDA5YzdiZmJkZC4uNWZjMDc3NjFjYWZmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmgKPiBAQCAtODgsNiArODgsNSBAQCB1aW50NjRfdCBpbnRlbF9scl9jb250ZXh0X2Rlc2Ny aXB0b3Ioc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKPiAgaW50IGludGVsX3Nhbml0aXpl X2VuYWJsZV9leGVjbGlzdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ICAJ CQkJICAgIGludCBlbmFibGVfZXhlY2xpc3RzKTsKPiAgdm9pZCBpbnRlbF9leGVjbGlzdHNfZW5h YmxlX3N1Ym1pc3Npb24oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKPiAtYm9v bCBpbnRlbF9leGVjbGlzdHNfaWRsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Owo+ICAKPiAgI2VuZGlmIC8qIF9JTlRFTF9MUkNfSF8gKi8KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCj4gaW5kZXggMzg1ODA3NjViZmQ2Li41NWE2YTNmODI3NGMgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCj4gQEAgLTY2NSw1ICs2 NjUsNiBAQCBzdGF0aWMgaW5saW5lIHUzMiAqZ2VuOF9lbWl0X3BpcGVfY29udHJvbCh1MzIgKmJh dGNoLCB1MzIgZmxhZ3MsIHUzMiBvZmZzZXQpCj4gIH0KPiAgCj4gIGJvb2wgaW50ZWxfZW5naW5l X2lzX2lkbGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKPiArYm9vbCBpbnRlbF9l bmdpbmVzX2FyZV9pZGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Cj4gIAo+ ICAjZW5kaWYgLyogX0lOVEVMX1JJTkdCVUZGRVJfSF8gKi8KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9yZXF1ZXN0LmMKPiBpbmRleCA0MmJkZWFjOTMz MjQuLjkyNmIyNGMxMTdkNiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxm dGVzdHMvaTkxNV9nZW1fcmVxdWVzdC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2Vs ZnRlc3RzL2k5MTVfZ2VtX3JlcXVlc3QuYwo+IEBAIC0zMDMsNyArMzAzLDcgQEAgc3RhdGljIGlu dCBlbmRfbGl2ZV90ZXN0KHN0cnVjdCBsaXZlX3Rlc3QgKnQpCj4gIHsKPiAgCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1ID0gdC0+aTkxNTsKPiAgCj4gLQlpZiAod2FpdF9mb3IoaW50ZWxf ZXhlY2xpc3RzX2lkbGUoaTkxNSksIDEpKSB7Cj4gKwlpZiAod2FpdF9mb3IoaW50ZWxfZW5naW5l c19hcmVfaWRsZShpOTE1KSwgMSkpIHsKPiAgCQlwcl9lcnIoIiVzKCVzKTogR1BVIG5vdCBpZGxl XG4iLCB0LT5mdW5jLCB0LT5uYW1lKTsKPiAgCQlyZXR1cm4gLUVJTzsKPiAgCX0KPiAtLSAKPiAy LjExLjAKPgo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Cj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK