From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH 05/21] drm/i915: Separate GPU hang waitqueue from advance Date: Mon, 6 Jun 2016 14:00:05 +0100 Message-ID: <575573D5.1040609@linux.intel.com> References: <1464970133-29859-1-git-send-email-chris@chris-wilson.co.uk> <1464970133-29859-6-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 722516E48C for ; Mon, 6 Jun 2016 13:00:07 +0000 (UTC) In-Reply-To: <1464970133-29859-6-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 Ck9uIDAzLzA2LzE2IDE3OjA4LCBDaHJpcyBXaWxzb24gd3JvdGU6Cj4gQ3VycmVudGx5IF9faTkx NV93YWl0X3JlcXVlc3QgdXNlcyBhIHBlci1lbmdpbmUgd2FpdF9xdWV1ZV90IGZvciB0aGUgZHVh bAo+IHB1cnBvc2Ugb2Ygd2FraW5nIGFmdGVyIHRoZSBHUFUgYWR2YW5jZXMgb3IgZm9yIHdha2lu ZyBhZnRlciBhbiBlcnJvci4KPiBJbiB0aGUgZnV0dXJlLCB3ZSBtYXkgYWRkIGV2ZW4gbW9yZSB3 YWtlIHNvdXJjZXMgYW5kIHJlcXVpcmUgZ3JlYXRlcgo+IHNlcGFyYXRpb24sIGJ1dCBmb3Igbm93 IHdlIGNhbiBjb25jZXB0dWFsbHkgc2ltcGxpZnkgd2FrZXVwcyBieSBzZXBhcmF0aW5nCj4gdGhl IHR3byBzb3VyY2VzLiBJbiBwYXJ0aWN1bGFyLCB0aGlzIGFsbG93cyB1cyB0byB1c2UgZGlmZmVy ZW50IHdhaXQtcXVldWVzCj4gKGUuZy4gb25lIG9uIHRoZSBlbmdpbmUgYWR2YW5jZW1lbnQsIGEg Z2xvYmFsIG9uZSBmb3IgZXJyb3JzIGFuZCBvbmUgb24KPiBlYWNoIHJlcXVlc3RzKSB3aXRob3V0 IGFueSBoYXNzbGUuCgorIEFydW4KCkkgdGhpbmsgdGhpcyB3aWxsIGNvbmZsaWN0IHdpdGggdGhl IFREUiB3b3JrIHdoZXJlIG9uZSBvZiB0aGUgZmVhdHVyZXMgCmlzIHRvIG1ha2UgcmVzZXQgaGFu ZGxpbmcgcGVyIGVuZ2luZS4gU28gSSBhbSBub3Qgc3VyZSBob3cgYmVuZWZpY2lhbCBpbiAKZ2Vu ZXJhbCwgb3IgcGFpbmZ1bCBmb3IgdGhlIFREUiBzZXJpZXMsIHRoaXMgcGF0Y2ggbWlnaHQgYmUu CgpSZWdhcmRzLAoKVHZydGtvCgo+IFNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCB8ICA2ICsrKysrKwo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8ICA1 ICsrKysrCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgMTkgKysrKy0tLS0t LS0tLS0tLS0tLQo+ICAgMyBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAxNSBkZWxl dGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IGluZGV4IGNlY2NjNmQ2YjExOS4u ZTM5OWU5Nzk2NWUwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gQEAgLTE0MDEsNiAr MTQwMSwxMiBAQCBzdHJ1Y3QgaTkxNV9ncHVfZXJyb3Igewo+ICAgI2RlZmluZSBJOTE1X1dFREdF RAkJCSgxIDw8IDMxKQo+Cj4gICAJLyoqCj4gKwkgKiBXYWl0cXVldWUgdG8gc2lnbmFsIHdoZW4g YSBoYW5nIGlzIGRldGVjdGVkLiBVc2VkIHRvIGZvciB3YWl0ZXJzCj4gKwkgKiB0byByZWxlYXNl IHRoZSBzdHJ1Y3RfbXV0ZXggZm9yIHRoZSByZXNldCB0byBwcm9jZWRlLgo+ICsJICovCj4gKwl3 YWl0X3F1ZXVlX2hlYWRfdCB3YWl0X3F1ZXVlOwo+ICsKPiArCS8qKgo+ICAgCSAqIFdhaXRxdWV1 ZSB0byBzaWduYWwgd2hlbiB0aGUgcmVzZXQgaGFzIGNvbXBsZXRlZC4gVXNlZCBieSBjbGllbnRz Cj4gICAJICogdGhhdCB3YWl0IGZvciBkZXZfcHJpdi0+bW0ud2VkZ2VkIHRvIHNldHRsZS4KPiAg IAkgKi8KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBpbmRleCAwMzI1NmYwOTZhYjYuLmRlNGZi MzkzMTJhNCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IEBAIC0xMjM0LDYgKzEyMzQs NyBAQCBpbnQgX19pOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSwKPiAgIAljb25zdCBib29sIGlycV90ZXN0X2luX3Byb2dyZXNzID0KPiAgIAkJQUNDRVNT X09OQ0UoZGV2X3ByaXYtPmdwdV9lcnJvci50ZXN0X2lycV9yaW5ncykgJiBpbnRlbF9lbmdpbmVf ZmxhZyhlbmdpbmUpOwo+ICAgCWludCBzdGF0ZSA9IGludGVycnVwdGlibGUgPyBUQVNLX0lOVEVS UlVQVElCTEUgOiBUQVNLX1VOSU5URVJSVVBUSUJMRTsKPiArCURFRklORV9XQUlUKHJlc2V0KTsK PiAgIAlERUZJTkVfV0FJVCh3YWl0KTsKPiAgIAl1bnNpZ25lZCBsb25nIHRpbWVvdXRfZXhwaXJl Owo+ICAgCXM2NCBiZWZvcmUgPSAwOyAvKiBPbmx5IHRvIHNpbGVuY2UgYSBjb21waWxlciB3YXJu aW5nLiAqLwo+IEBAIC0xMjc4LDYgKzEyNzksNyBAQCBpbnQgX19pOTE1X3dhaXRfcmVxdWVzdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKPiAgIAkJZ290byBvdXQ7Cj4gICAJfQo+ Cj4gKwlhZGRfd2FpdF9xdWV1ZSgmZGV2X3ByaXYtPmdwdV9lcnJvci53YWl0X3F1ZXVlLCAmcmVz ZXQpOwo+ICAgCWZvciAoOzspIHsKPiAgIAkJc3RydWN0IHRpbWVyX2xpc3QgdGltZXI7Cj4KPiBA QCAtMTMyOSw2ICsxMzMxLDggQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXEsCj4gICAJCQlkZXN0cm95X3RpbWVyX29uX3N0YWNrKCZ0aW1l cik7Cj4gICAJCX0KPiAgIAl9Cj4gKwlyZW1vdmVfd2FpdF9xdWV1ZSgmZGV2X3ByaXYtPmdwdV9l cnJvci53YWl0X3F1ZXVlLCAmcmVzZXQpOwo+ICsKPiAgIAlpZiAoIWlycV90ZXN0X2luX3Byb2dy ZXNzKQo+ICAgCQllbmdpbmUtPmlycV9wdXQoZW5naW5lKTsKPgo+IEBAIC01MDI2LDYgKzUwMzAs NyBAQCBpOTE1X2dlbV9sb2FkX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgIAkJCSAg aTkxNV9nZW1fcmV0aXJlX3dvcmtfaGFuZGxlcik7Cj4gICAJSU5JVF9ERUxBWUVEX1dPUksoJmRl dl9wcml2LT5tbS5pZGxlX3dvcmssCj4gICAJCQkgIGk5MTVfZ2VtX2lkbGVfd29ya19oYW5kbGVy KTsKPiArCWluaXRfd2FpdHF1ZXVlX2hlYWQoJmRldl9wcml2LT5ncHVfZXJyb3Iud2FpdF9xdWV1 ZSk7Cj4gICAJaW5pdF93YWl0cXVldWVfaGVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9x dWV1ZSk7Cj4KPiAgIAlkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3RhbnRzX21vZGUgPSBJOTE1X0VY RUNfQ09OU1RBTlRTX1JFTF9HRU5FUkFMOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+IGluZGV4 IDgzY2FiMTQ2MzliMi4uMzAxMjdiOTRmMjZlIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfaXJxLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j Cj4gQEAgLTI0ODgsMTEgKzI0ODgsOCBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgZ2VuOF9pcnFfaGFu ZGxlcihpbnQgaXJxLCB2b2lkICphcmcpCj4gICAJcmV0dXJuIHJldDsKPiAgIH0KPgo+IC1zdGF0 aWMgdm9pZCBpOTE1X2Vycm9yX3dha2VfdXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAo+IC0JCQkgICAgICAgYm9vbCByZXNldF9jb21wbGV0ZWQpCj4gK3N0YXRpYyB2b2lkIGk5 MTVfZXJyb3Jfd2FrZV91cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gICB7 Cj4gLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Cj4gLQo+ICAgCS8qCj4gICAJICog Tm90aWZ5IGFsbCB3YWl0ZXJzIGZvciBHUFUgY29tcGxldGlvbiBldmVudHMgdGhhdCByZXNldCBz dGF0ZSBoYXMKPiAgIAkgKiBiZWVuIGNoYW5nZWQsIGFuZCB0aGF0IHRoZXkgbmVlZCB0byByZXN0 YXJ0IHRoZWlyIHdhaXQgYWZ0ZXIKPiBAQCAtMjUwMSwxOCArMjQ5OCwxMCBAQCBzdGF0aWMgdm9p ZCBpOTE1X2Vycm9yX3dha2VfdXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ ICAgCSAqLwo+Cj4gICAJLyogV2FrZSB1cCBfX3dhaXRfc2Vxbm8sIHBvdGVudGlhbGx5IGhvbGRp bmcgZGV2LT5zdHJ1Y3RfbXV0ZXguICovCj4gLQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZf cHJpdikKPiAtCQl3YWtlX3VwX2FsbCgmZW5naW5lLT5pcnFfcXVldWUpOwo+ICsJd2FrZV91cF9h bGwoJmRldl9wcml2LT5ncHVfZXJyb3Iud2FpdF9xdWV1ZSk7Cj4KPiAgIAkvKiBXYWtlIHVwIGlu dGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcywgaG9sZGluZyBjcnRjLT5tdXRleC4gKi8K PiAgIAl3YWtlX3VwX2FsbCgmZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9xdWV1ZSk7Cj4gLQo+IC0J LyoKPiAtCSAqIFNpZ25hbCB0YXNrcyBibG9ja2VkIGluIGk5MTVfZ2VtX3dhaXRfZm9yX2Vycm9y IHRoYXQgdGhlIHBlbmRpbmcKPiAtCSAqIHJlc2V0IHN0YXRlIGlzIGNsZWFyZWQuCj4gLQkgKi8K PiAtCWlmIChyZXNldF9jb21wbGV0ZWQpCj4gLQkJd2FrZV91cF9hbGwoJmRldl9wcml2LT5ncHVf ZXJyb3IucmVzZXRfcXVldWUpOwo+ICAgfQo+Cj4gICAvKioKPiBAQCAtMjU3Nyw3ICsyNTY2LDcg QEAgc3RhdGljIHZvaWQgaTkxNV9yZXNldF9hbmRfd2FrZXVwKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKPiAgIAkJICogTm90ZTogVGhlIHdha2VfdXAgYWxzbyBzZXJ2ZXMgYXMg YSBtZW1vcnkgYmFycmllciBzbyB0aGF0Cj4gICAJCSAqIHdhaXRlcnMgc2VlIHRoZSB1cGRhdGUg dmFsdWUgb2YgdGhlIHJlc2V0IGNvdW50ZXIgYXRvbWljX3QuCj4gICAJCSAqLwo+IC0JCWk5MTVf ZXJyb3Jfd2FrZV91cChkZXZfcHJpdiwgdHJ1ZSk7Cj4gKwkJd2FrZV91cF9hbGwoJmRldl9wcml2 LT5ncHVfZXJyb3IucmVzZXRfcXVldWUpOwo+ICAgCX0KPiAgIH0KPgo+IEBAIC0yNzEzLDcgKzI3 MDIsNyBAQCB2b2lkIGk5MTVfaGFuZGxlX2Vycm9yKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKPiAgIAkJICogZW5zdXJlIHRoYXQgdGhlIHdhaXRlcnMgc2VlIHRoZSB1cGRhdGVk IHZhbHVlIG9mIHRoZSByZXNldAo+ICAgCQkgKiBjb3VudGVyIGF0b21pY190Lgo+ICAgCQkgKi8K PiAtCQlpOTE1X2Vycm9yX3dha2VfdXAoZGV2X3ByaXYsIGZhbHNlKTsKPiArCQlpOTE1X2Vycm9y X3dha2VfdXAoZGV2X3ByaXYpOwo+ICAgCX0KPgo+ICAgCWk5MTVfcmVzZXRfYW5kX3dha2V1cChk ZXZfcHJpdik7Cj4KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==