From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joonas Lahtinen Subject: Re: [PATCH 07/18] drm/i915: Restore nonblocking awaits for modesetting Date: Mon, 19 Sep 2016 19:01:38 +0300 Message-ID: <1474300898.3344.68.camel@linux.intel.com> References: <20160914065250.15482-1-chris@chris-wilson.co.uk> <20160914065250.15482-8-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 ESMTPS id C0A506E4F1 for ; Mon, 19 Sep 2016 16:01:42 +0000 (UTC) In-Reply-To: <20160914065250.15482-8-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 TWFhcnRlbiwgY291bGQgeW91IGdpdmUgdGhpcyBhIGxvb2s/CgpPbiBrZSwgMjAxNi0wOS0xNCBh dCAwNzo1MiArMDEwMCwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+IEFmdGVyIGNvbWJpbmluZyB0aGUg ZG1hLWJ1ZiByZXNlcnZhdGlvbiBvYmplY3QgYW5kIHRoZSBHRU0gcmVzZXJ2YXRpb24KPiBvYmpl Y3QsIHdlIGxvc3QgdGhlIGFiaWxpdHkgdG8gZG8gYSBub25ibG9ja2luZyB3YWl0IG9uIHRoZSBp OTE1IHJlcXVlc3QKPiAoYXMgd2UgYmxvY2tlZCB1cG9uIHRoZSByZXNlcnZhdGlvbiBvYmplY3Qg ZHVyaW5nIHByZXBhcmVfZmIpLiBXZSBjYW4KPiBpbnN0ZWFkIGNvbnZlcnQgdGhlIHJlc2VydmF0 aW9uIG9iamVjdCBpbnRvIGEgZmVuY2UgdXBvbiB3aGljaCB3ZSBjYW4KPiBhc3luY2hyb25vdXNs eSB3YWl0IChpbmNsdWRpbmcgYSBmb3JjZWQgdGltZW91dCBpbiBjYXNlIHRoZSBETUEgZmVuY2Ug aXMKPiBuZXZlciBzaWduYWxlZCkuCj4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPiAtLS0KPiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyB8IDc4ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LQo+IMKgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmjCoMKgwqDCoMKgfMKgwqAyICsK PiDCoDIgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCj4g Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IDVjMGVhMDhkZGRiMy4u Mjk0ZGYxMjJmN2M2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IEBA IC0xNDM4MywxMiArMTQzODMsMzMgQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90 YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKPiDCoAo+IMKgc3RhdGljIHZvaWQg aW50ZWxfYXRvbWljX2NvbW1pdF93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiDCoHsK PiA+IC0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY29udGFpbmVyX29mKHdvcmss Cj4gPiAtCQkJCQkJwqDCoMKgwqDCoMKgc3RydWN0IGRybV9hdG9taWNfc3RhdGUsCj4gPiAtCQkJ CQkJwqDCoMKgwqDCoMKgY29tbWl0X3dvcmspOwo+ID4gKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUgPQo+ID4gKwkJY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlLCBjb21taXRfd29yayk7Cj4gKwo+ID4gwqAJaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0 YXRlKTsKPiDCoH0KPiDCoAo+ICtzdGF0aWMgaW50IF9faTkxNV9zd19mZW5jZV9jYWxsCj4gK2lu dGVsX2F0b21pY19jb21taXRfcmVhZHkoc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAo+ID4g KwkJCcKgwqBlbnVtIGk5MTVfc3dfZmVuY2Vfbm90aWZ5IG5vdGlmeSkKPiArewo+ID4gKwlzdHJ1 Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSA9Cj4gPiArCQljb250YWluZXJfb2YoZmVuY2Us IHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUsIGNvbW1pdF9yZWFkeSk7Cj4gKwo+ID4gKwlzd2l0 Y2ggKG5vdGlmeSkgewo+ID4gKwljYXNlIEZFTkNFX0NPTVBMRVRFOgo+ID4gKwkJaWYgKHN0YXRl LT5iYXNlLmNvbW1pdF93b3JrLmZ1bmMpCj4gPiArCQkJcXVldWVfd29yayhzeXN0ZW1fdW5ib3Vu ZF93cSwgJnN0YXRlLT5iYXNlLmNvbW1pdF93b3JrKTsKPiA+ICsJCWJyZWFrOwo+ICsKPiA+ICsJ Y2FzZSBGRU5DRV9GUkVFOgo+ID4gKwkJZHJtX2F0b21pY19zdGF0ZV9wdXQoJnN0YXRlLT5iYXNl KTsKPiA+ICsJCWJyZWFrOwo+ID4gKwl9Cj4gKwo+ID4gKwlyZXR1cm4gTk9USUZZX0RPTkU7Cj4g K30KPiArCj4gwqBzdGF0aWMgdm9pZCBpbnRlbF9hdG9taWNfdHJhY2tfZmJzKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSkKPiDCoHsKPiA+IMKgCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUg Km9sZF9wbGFuZV9zdGF0ZTsKPiBAQCAtMTQ0MzQsMTEgKzE0NDU1LDE0IEBAIHN0YXRpYyBpbnQg aW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gwqAJaWYgKHJl dCkKPiA+IMKgCQlyZXR1cm4gcmV0Owo+IMKgCj4gPiAtCUlOSVRfV09SSygmc3RhdGUtPmNvbW1p dF93b3JrLCBpbnRlbF9hdG9taWNfY29tbWl0X3dvcmspOwo+ID4gKwlkcm1fYXRvbWljX3N0YXRl X2dldChzdGF0ZSk7Cj4gPiArCWk5MTVfc3dfZmVuY2VfaW5pdCgmaW50ZWxfc3RhdGUtPmNvbW1p dF9yZWFkeSwKPiA+ICsJCQnCoMKgwqBpbnRlbF9hdG9taWNfY29tbWl0X3JlYWR5KTsKPiDCoAo+ ID4gwqAJcmV0ID0gaW50ZWxfYXRvbWljX3ByZXBhcmVfY29tbWl0KGRldiwgc3RhdGUpOwo+ID4g wqAJaWYgKHJldCkgewo+ID4gwqAJCURSTV9ERUJVR19BVE9NSUMoIlByZXBhcmluZyBzdGF0ZSBm YWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKPiA+ICsJCWk5MTVfc3dfZmVuY2VfY29tbWl0KCZpbnRl bF9zdGF0ZS0+Y29tbWl0X3JlYWR5KTsKPiA+IMKgCQlyZXR1cm4gcmV0Owo+ID4gwqAJfQo+IMKg Cj4gQEAgLTE0NDQ5LDEwICsxNDQ3MywxNCBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jb21t aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+IMKgCWludGVsX2F0b21pY190cmFja19mYnMo c3RhdGUpOwo+IMKgCj4gPiDCoAlkcm1fYXRvbWljX3N0YXRlX2dldChzdGF0ZSk7Cj4gPiAtCWlm IChub25ibG9jaykKPiA+IC0JCXF1ZXVlX3dvcmsoc3lzdGVtX3VuYm91bmRfd3EsICZzdGF0ZS0+ Y29tbWl0X3dvcmspOwo+ID4gLQllbHNlCj4gPiArCUlOSVRfV09SSygmc3RhdGUtPmNvbW1pdF93 b3JrLAo+ID4gKwkJwqDCoG5vbmJsb2NrID8gaW50ZWxfYXRvbWljX2NvbW1pdF93b3JrIDogTlVM TCk7Cj4gKwo+ID4gKwlpOTE1X3N3X2ZlbmNlX2NvbW1pdCgmaW50ZWxfc3RhdGUtPmNvbW1pdF9y ZWFkeSk7Cj4gPiArCWlmICghbm9uYmxvY2spIHsKPiA+ICsJCWk5MTVfc3dfZmVuY2Vfd2FpdCgm aW50ZWxfc3RhdGUtPmNvbW1pdF9yZWFkeSk7Cj4gPiDCoAkJaW50ZWxfYXRvbWljX2NvbW1pdF90 YWlsKHN0YXRlKTsKPiA+ICsJfQo+IMKgCj4gPiDCoAlyZXR1cm4gMDsKPiDCoH0KPiBAQCAtMTQ1 NjgsOCArMTQ1OTYsNyBAQCBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAo+ID4gwqAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBuZXdfc3RhdGUtPmZi Owo+ID4gwqAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihm Yik7Cj4gPiDCoAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVsX2Zi X29iaihwbGFuZS0+c3RhdGUtPmZiKTsKPiA+IC0JbG9uZyBscmV0Owo+ID4gLQlpbnQgcmV0ID0g MDsKPiA+ICsJaW50IHJldDsKPiDCoAo+ID4gwqAJaWYgKCFvYmogJiYgIW9sZF9vYmopCj4gPiDC oAkJcmV0dXJuIDA7Cj4gQEAgLTE0NTc3LDcgKzE0NjA0LDYgQEAgaW50ZWxfcHJlcGFyZV9wbGFu ZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKPiA+IMKgCWlmIChvbGRfb2JqKSB7Cj4gPiDC oAkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KPiA+IMKgCQkJZHJtX2F0b21p Y19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShuZXdfc3RhdGUtPnN0YXRlLCBwbGFuZS0+c3RhdGUt PmNydGMpOwo+ID4gLQkJbG9uZyB0aW1lb3V0ID0gMDsKPiDCoAo+ID4gwqAJCS8qIEJpZyBIYW1t ZXIsIHdlIGFsc28gbmVlZCB0byBlbnN1cmUgdGhhdCBhbnkgcGVuZGluZwo+ID4gwqAJCcKgKiBN SV9XQUlUX0ZPUl9FVkVOVCBpbnNpZGUgYSB1c2VyIGJhdGNoIGJ1ZmZlciBvbiB0aGUKPiBAQCAt MTQ1OTAsMzEgKzE0NjE2LDI1IEBAIGludGVsX3ByZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCj4gPiDCoAkJwqAqIFRoaXMgc2hvdWxkIG9ubHkgZmFpbCB1cG9uIGEgaHVu ZyBHUFUsIGluIHdoaWNoIGNhc2Ugd2UKPiA+IMKgCQnCoCogY2FuIHNhZmVseSBjb250aW51ZS4K PiA+IMKgCQnCoCovCj4gPiAtCQlpZiAobmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKPiA+IC0J CQl0aW1lb3V0ID0gaTkxNV9nZW1fb2JqZWN0X3dhaXQob2xkX29iaiwKPiA+IC0JCQkJCQnCoMKg wqDCoMKgwqDCoEk5MTVfV0FJVF9JTlRFUlJVUFRJQkxFIHwKPiA+IC0JCQkJCQnCoMKgwqDCoMKg wqDCoEk5MTVfV0FJVF9MT0NLRUQsCj4gPiAtCQkJCQkJwqDCoMKgwqDCoMKgwqBNQVhfU0NIRURV TEVfVElNRU9VVCwKPiA+IC0JCQkJCQnCoMKgwqDCoMKgwqDCoE5VTEwpOwo+ID4gLQkJaWYgKHRp bWVvdXQgPCAwKSB7Cj4gPiAtCQkJLyogR1BVIGhhbmdzIHNob3VsZCBoYXZlIGJlZW4gc3dhbGxv d2VkIGJ5IHRoZSB3YWl0ICovCj4gPiAtCQkJV0FSTl9PTih0aW1lb3V0ID09IC1FSU8pOwo+ID4g LQkJCXJldHVybiB0aW1lb3V0Owo+ID4gKwkJaWYgKG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkp IHsKPiA+ICsJCQlyZXQgPSBpOTE1X3N3X2ZlbmNlX2F3YWl0X3Jlc2VydmF0aW9uKCZ0b19pbnRl bF9hdG9taWNfc3RhdGUobmV3X3N0YXRlLT5zdGF0ZSktPmNvbW1pdF9yZWFkeSwKPiA+ICsJCQkJ CQkJwqDCoMKgwqDCoMKgb2xkX29iai0+cmVzdiwgTlVMTCwKPiA+ICsJCQkJCQkJwqDCoMKgwqDC oMKgZmFsc2UsIDAsCj4gPiArCQkJCQkJCcKgwqDCoMKgwqDCoEdGUF9LRVJORUwpOwo+ID4gKwkJ CWlmIChyZXQgPCAwKQo+ID4gKwkJCQlyZXR1cm4gcmV0Owo+ID4gwqAJCX0KPiA+IMKgCX0KPiDC oAo+ID4gwqAJaWYgKCFvYmopCj4gPiDCoAkJcmV0dXJuIDA7Cj4gwqAKPiA+IC0JLyogRm9yIGZy YW1lYnVmZmVyIGJhY2tlZCBieSBkbWFidWYsIHdhaXQgZm9yIGZlbmNlICovCj4gPiAtCWxyZXQg PSBpOTE1X2dlbV9vYmplY3Rfd2FpdChvYmosCj4gPiAtCQkJCcKgwqDCoMKgSTkxNV9XQUlUX0lO VEVSUlVQVElCTEUgfCBJOTE1X1dBSVRfTE9DS0VELAo+ID4gLQkJCQnCoMKgwqDCoE1BWF9TQ0hF RFVMRV9USU1FT1VULAo+ID4gLQkJCQnCoMKgwqDCoE5VTEwpOwo+ID4gLQlpZiAobHJldCA9PSAt RVJFU1RBUlRTWVMpCj4gPiAtCQlyZXR1cm4gbHJldDsKPiAtCj4gPiAtCVdBUk4obHJldCA8IDAs ICJ3YWl0aW5nIHJldHVybnMgJWxpXG4iLCBscmV0KTsKPiA+ICsJcmV0ID0gaTkxNV9zd19mZW5j ZV9hd2FpdF9yZXNlcnZhdGlvbigmdG9faW50ZWxfYXRvbWljX3N0YXRlKG5ld19zdGF0ZS0+c3Rh dGUpLT5jb21taXRfcmVhZHksCj4gPiArCQkJCQnCoMKgwqDCoMKgwqBvYmotPnJlc3YsIE5VTEws Cj4gPiArCQkJCQnCoMKgwqDCoMKgwqBmYWxzZSwgMTAqSFosCj4gPiArCQkJCQnCoMKgwqDCoMKg wqBHRlBfS0VSTkVMKTsKPiA+ICsJaWYgKHJldCA8IDApCj4gPiArCQlyZXR1cm4gcmV0Owo+IMKg Cj4gPiDCoAlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SICYmCj4gPiDC oAnCoMKgwqDCoElOVEVMX0lORk8oZGV2KS0+Y3Vyc29yX25lZWRzX3BoeXNpY2FsKSB7Cj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBpbmRleCAxNWUzMDUwZWRlYjkuLmNiOTlhMjU0MDg2MyAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gQEAgLTM1Nyw2ICszNTcsOCBAQCBzdHJ1 Y3QgaW50ZWxfYXRvbWljX3N0YXRlIHsKPiDCoAo+ID4gwqAJLyogR2VuOSsgb25seSAqLwo+ID4g wqAJc3RydWN0IHNrbF93bV92YWx1ZXMgd21fcmVzdWx0czsKPiArCj4gPiArCXN0cnVjdCBpOTE1 X3N3X2ZlbmNlIGNvbW1pdF9yZWFkeTsKPiDCoH07Cj4gwqAKPiDCoHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSB7Ci0tIApKb29uYXMgTGFodGluZW4KT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50 ZXIKSW50ZWwgQ29ycG9yYXRpb24KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==