From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH 5/5] drm/i915: Make wait_for_flips interruptible. Date: Tue, 21 Jul 2015 14:33:33 +0200 Message-ID: <55AE3C1D.6040806@linux.intel.com> References: <1437051471-15397-1-git-send-email-maarten.lankhorst@linux.intel.com> <1437051471-15397-6-git-send-email-maarten.lankhorst@linux.intel.com> <20150721112657.GE6166@nuc-i3427.alporthouse.com> 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 6B1B26E1A0 for ; Tue, 21 Jul 2015 05:33:36 -0700 (PDT) In-Reply-To: <20150721112657.GE6166@nuc-i3427.alporthouse.com> 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 T3AgMjEtMDctMTUgb20gMTM6MjYgc2NocmVlZiBDaHJpcyBXaWxzb246Cj4gT24gVGh1LCBKdWwg MTYsIDIwMTUgYXQgMDI6NTc6NTFQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9yc3Qgd3JvdGU6Cj4+ IE1vdmUgaXQgZnJvbSBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgdG8gcHJlcGFyZV9wbGFuZV9m Yi4KPj4gV2FpdGluZyBpcyBkb25lIGJlZm9yZSBjb21taXR0aW5nLCBvdGhlcndpc2UgaXQncyB0 b28gbGF0ZQo+PiB0byB1bmRvIHRoZSBjaGFuZ2VzLgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBNYWFy dGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+PiAtLS0K Pj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jICB8ICAyIC0KPj4gIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDcyICsrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLQo+PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAg IHwgIDIgLQo+PiAgMyBmaWxlcyBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCspLCA0MyBkZWxldGlv bnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21p Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKPj4gaW5kZXggZTI1MzFj ZjU5MjY2Li4wOWEwYWQ2MTEwMDIgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2F0b21pYy5jCj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21p Yy5jCj4+IEBAIC0yMTQsOCArMjE0LDYgQEAgaW50IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4+ICAJCQkJICogYnV0IHNpbmNlIHRoaXMgcGxhbmUg aXMgdW5jaGFuZ2VkIGp1c3QgZG8gdGhlCj4+ICAJCQkJICogbWluaW11bSByZXF1aXJlZCB2YWxp ZGF0aW9uLgo+PiAgCQkJCSAqLwo+PiAtCQkJCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVf VFlQRV9QUklNQVJZKQo+PiAtCQkJCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMg PSB0cnVlOwo+PiAgCQkJCWNydGNfc3RhdGUtPmJhc2UucGxhbmVzX2NoYW5nZWQgPSB0cnVlOwo+ PiAgCQkJfQo+PiAgCj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPj4gaW5kZXgg NWE0NjJlOWE0ZDE0Li44ZWYwZGJiMzNhZmQgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKPj4gQEAgLTMyNTAsMzIgKzMyNTAsNiBAQCB2b2lkIGludGVsX2ZpbmlzaF9y ZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+PiAgCWRybV9tb2Rlc2V0X3VubG9ja19hbGwo ZGV2KTsKPj4gIH0KPj4gIAo+PiAtc3RhdGljIHZvaWQKPj4gLWludGVsX2ZpbmlzaF9mYihzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpvbGRfZmIpCj4+IC17Cj4+IC0Jc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29iaihvbGRfZmIpOwo+PiAtCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUob2JqLT5iYXNlLmRldik7Cj4+IC0JYm9vbCB3 YXNfaW50ZXJydXB0aWJsZSA9IGRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlOwo+PiAtCWludCBy ZXQ7Cj4+IC0KPj4gLQkvKiBCaWcgSGFtbWVyLCB3ZSBhbHNvIG5lZWQgdG8gZW5zdXJlIHRoYXQg YW55IHBlbmRpbmcKPj4gLQkgKiBNSV9XQUlUX0ZPUl9FVkVOVCBpbnNpZGUgYSB1c2VyIGJhdGNo IGJ1ZmZlciBvbiB0aGUKPj4gLQkgKiBjdXJyZW50IHNjYW5vdXQgaXMgcmV0aXJlZCBiZWZvcmUg dW5waW5uaW5nIHRoZSBvbGQKPj4gLQkgKiBmcmFtZWJ1ZmZlci4gTm90ZSB0aGF0IHdlIHJlbHkg b24gdXNlcnNwYWNlIHJlbmRlcmluZwo+PiAtCSAqIGludG8gdGhlIGJ1ZmZlciBhdHRhY2hlZCB0 byB0aGUgcGlwZSB0aGV5IGFyZSB3YWl0aW5nCj4+IC0JICogb24uIElmIG5vdCwgdXNlcnNwYWNl IGdlbmVyYXRlcyBhIEdQVSBoYW5nIHdpdGggSVBFSFIKPj4gLQkgKiBwb2ludCB0byB0aGUgTUlf V0FJVF9GT1JfRVZFTlQuCj4+IC0JICoKPj4gLQkgKiBUaGlzIHNob3VsZCBvbmx5IGZhaWwgdXBv biBhIGh1bmcgR1BVLCBpbiB3aGljaCBjYXNlIHdlCj4+IC0JICogY2FuIHNhZmVseSBjb250aW51 ZS4KPj4gLQkgKi8KPj4gLQlkZXZfcHJpdi0+bW0uaW50ZXJydXB0aWJsZSA9IGZhbHNlOwo+PiAt CXJldCA9IGk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZyhvYmosIHRydWUpOwo+PiAtCWRl dl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlID0gd2FzX2ludGVycnVwdGlibGU7Cj4+IC0KPj4gLQlX QVJOX09OKHJldCk7Cj4+IC19Cj4+IC0KPj4gIHN0YXRpYyBib29sIGludGVsX2NydGNfaGFzX3Bl bmRpbmdfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4+ICB7Cj4+ICAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmRldjsKPj4gQEAgLTM4OTAsMTUgKzM4NjQsMjMgQEAgc3RhdGlj IHZvaWQgcGFnZV9mbGlwX2NvbXBsZXRlZChzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykK Pj4gIAkJCQkgd29yay0+cGVuZGluZ19mbGlwX29iaik7Cj4+ICB9Cj4+ICAKPj4gLXZvaWQgaW50 ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPj4g K3N0YXRpYyBpbnQgaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKPj4gIHsKPj4gIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2 Owo+PiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7Cj4+ICsJbG9uZyByZXQ7Cj4+ICAKPj4gIAlXQVJOX09OKHdhaXRxdWV1ZV9hY3RpdmUoJmRl dl9wcml2LT5wZW5kaW5nX2ZsaXBfcXVldWUpKTsKPj4gLQlpZiAoV0FSTl9PTih3YWl0X2V2ZW50 X3RpbWVvdXQoZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9xdWV1ZSwKPj4gLQkJCQkgICAgICAgIWlu dGVsX2NydGNfaGFzX3BlbmRpbmdfZmxpcChjcnRjKSwKPj4gLQkJCQkgICAgICAgNjAqSFopID09 IDApKSB7Cj4+ICsKPj4gKwlyZXQgPSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91dCgK Pj4gKwkJCQkJZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9xdWV1ZSwKPj4gKwkJCQkJIWludGVsX2Ny dGNfaGFzX3BlbmRpbmdfZmxpcChjcnRjKSwKPj4gKwkJCQkJNjAqSFopOwo+PiArCj4+ICsJaWYg KHJldCA8IDApCj4+ICsJCXJldHVybiByZXQ7Cj4+ICsKPj4gKwlpZiAocmV0ID09IDApIHsKPj4g IAkJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwo+ PiAgCj4+ICAJCXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7Cj4+IEBAIC0zOTA5LDEx ICszODkxLDcgQEAgdm9pZCBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoc3RydWN0 IGRybV9jcnRjICpjcnRjKQo+PiAgCQlzcGluX3VubG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7 Cj4+ICAJfQo+PiAgCj4+IC0JaWYgKGNydGMtPnByaW1hcnktPmZiKSB7Cj4+IC0JCW11dGV4X2xv Y2soJmRldi0+c3RydWN0X211dGV4KTsKPj4gLQkJaW50ZWxfZmluaXNoX2ZiKGNydGMtPnByaW1h cnktPmZiKTsKPj4gLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4+IC0JfQo+ PiArCXJldHVybiAwOwo+PiAgfQo+PiAgCj4+ICAvKiBQcm9ncmFtIGlDTEtJUCBjbG9jayB0byB0 aGUgZGVzaXJlZCBmcmVxdWVuY3kgKi8KPj4gQEAgLTQ3NzMsOSArNDc1MSw2IEBAIHN0YXRpYyB2 b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCj4+ICAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPj4g IAlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRvbWlj Owo+PiAgCj4+IC0JaWYgKGF0b21pYy0+d2FpdF9mb3JfZmxpcHMpCj4+IC0JCWludGVsX2NydGNf d2FpdF9mb3JfcGVuZGluZ19mbGlwcygmY3J0Yy0+YmFzZSk7Cj4+IC0KPj4gIAlpZiAoYXRvbWlj LT5kaXNhYmxlX2ZiYykKPj4gIAkJaW50ZWxfZmJjX2Rpc2FibGVfY3J0YyhjcnRjKTsKPj4gIAo+ PiBAQCAtMTE3MDEsNyArMTE2NzYsNiBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hh bmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCj4+ICAKPj4gIAlzd2l0Y2gg KHBsYW5lLT50eXBlKSB7Cj4+ICAJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgo+PiAtCQlp bnRlbF9jcnRjLT5hdG9taWMud2FpdF9mb3JfZmxpcHMgPSB0cnVlOwo+PiAgCQlpbnRlbF9jcnRj LT5hdG9taWMucHJlX2Rpc2FibGVfcHJpbWFyeSA9IHR1cm5fb2ZmOwo+PiAgCQlpbnRlbF9jcnRj LT5hdG9taWMucG9zdF9lbmFibGVfcHJpbWFyeSA9IHR1cm5fb247Cj4+ICAKPj4gQEAgLTEzNDcz LDYgKzEzNDQ3LDEyIEBAIGludGVsX3ByZXBhcmVfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCj4+ICAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9vYmogPSBpbnRlbF9m Yl9vYmoocGxhbmUtPnN0YXRlLT5mYik7Cj4+ICAJaW50IHJldCA9IDA7Cj4+ICAKPj4gKwlpZiAo cGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSAmJiBvbGRfb2JqKSB7Cj4gV291 bGQgZmVlbCBzYWZlciBpcyB3ZSBqdXN0IGFza2VkIGlmIHRoZSBDUlRDIGhhZCBwZW5kaW5nIGZs aXBzCj4gaXJyZXNwZWN0aXZlIG9mIG9sZF9vYmouIERvIHlvdSBwbGFuIG9uIG1vdmluZyB0aGUg cGVuZGluZyBmbGlwcyBmcm9tCj4gQ1JUQyB0byBwbGFuZT8gVGhhdCB3b3VsZCBzZWVtIHRvIGJl IGltcGxpZWQgaGVyZS4KVGhpcyBwcmVzZXJ2ZXMgb2xkIGJlaGF2aW9yIHNpbmNlIHBhZ2UgZmxp cHMgY2FuIG9ubHkgaGFwcGVuIG9uIHByaW1hcnkgcGxhbmVzLgpEbyB5b3Ugd2FudCBjdXJzb3Ig dXBkYXRlcyB0byB3YWl0IG9uIHBlbmRpbmcgcHJpbWFyeSBmbGlwcz8KCj4+ICsJCXJldCA9IGlu dGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhwbGFuZS0+c3RhdGUtPmNydGMpOwo+PiAr CQlpZiAocmV0KQo+PiArCQkJcmV0dXJuIHJldDsKPj4gKwl9Cj4+ICsKPj4gIAlpZiAob2JqID09 IG9sZF9vYmopCj4+ICAJCXJldHVybiAwOwo+PiAgCj4+IEBAIC0xMzQ5Miw2ICsxMzQ3MiwyMCBA QCBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+PiAgCQly ZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihwbGFuZSwgZmIsIG5ld19zdGF0ZSwgTlVM TCwgTlVMTCk7Cj4+ICAJfQo+PiAgCj4+ICsJLyogQmlnIEhhbW1lciwgd2UgYWxzbyBuZWVkIHRv IGVuc3VyZSB0aGF0IGFueSBwZW5kaW5nCj4+ICsJICogTUlfV0FJVF9GT1JfRVZFTlQgaW5zaWRl IGEgdXNlciBiYXRjaCBidWZmZXIgb24gdGhlCj4+ICsJICogY3VycmVudCBzY2Fub3V0IGlzIHJl dGlyZWQgYmVmb3JlIHVucGlubmluZyB0aGUgb2xkCj4+ICsJICogZnJhbWVidWZmZXIuIE5vdGUg dGhhdCB3ZSByZWx5IG9uIHVzZXJzcGFjZSByZW5kZXJpbmcKPj4gKwkgKiBpbnRvIHRoZSBidWZm ZXIgYXR0YWNoZWQgdG8gdGhlIHBpcGUgdGhleSBhcmUgd2FpdGluZwo+PiArCSAqIG9uLiBJZiBu b3QsIHVzZXJzcGFjZSBnZW5lcmF0ZXMgYSBHUFUgaGFuZyB3aXRoIElQRUhSCj4+ICsJICogcG9p bnQgdG8gdGhlIE1JX1dBSVRfRk9SX0VWRU5ULgo+PiArCSAqCj4+ICsJICogVGhpcyBzaG91bGQg b25seSBmYWlsIHVwb24gYSBodW5nIEdQVSwgaW4gd2hpY2ggY2FzZSB3ZQo+PiArCSAqIGNhbiBz YWZlbHkgY29udGludWUuCj4+ICsJICovCj4+ICsJaWYgKCFyZXQgJiYgcGxhbmUtPnR5cGUgPT0g RFJNX1BMQU5FX1RZUEVfUFJJTUFSWSAmJiBvbGRfb2JqKQo+PiArCQlyZXQgPSBpOTE1X2dlbV9v YmplY3Rfd2FpdF9yZW5kZXJpbmcob2xkX29iaiwgdHJ1ZSk7Cj4gVGVjaG5pY2FsbHkgSSBjYW4g Y3JlYXRlIGEgYmF0Y2ggd2l0aCBhIFdBSVRfT05fRVZFTlQgZm9yIGEgc2Vjb25kYXJ5Cj4gcGxh bmUgYXMgd2VsbC4gVGhpcyBwYXRoIG5lZWQgb25seSBiZSBkb25lIGluIGEgbW9kZXNldCwgbm90 IGZvciBhCj4gc2ltcGxlIHBsYW5lIGZsaXAuIChCdXQgd2UgYWN0dWFsbHkgbmVlZCB0byBzZXJp YWxpc2Ugd2l0aCByZW5kZXJpbmcgdG8KPiBvbGRfb2JqIGJlZm9yZSByZWdhcmRpbmcgdGhlIHBs YW5lIGZsaXAgYXMgY29tcGxldGUuKSBJcyB0aGVyZSBhCj4gcGxhbmUtcHJlcGFyZS1tb2Rlc2V0 IGhvb2s/ClRoZSBjb21tZW50IGRpZG4ndCBleHBsYWluIHRoYXQsIGlzIGhpZGluZyB0aGlzIGJl aGluZCBhIG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkgc3VmZmljaWVudCBoZXJlPwoKfk1hYXJ0 ZW4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==