From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 2/3] drm/i915: Clean up GPU hang message Date: Tue, 05 Jul 2016 13:01:07 +0300 Message-ID: <87k2h0v1y4.fsf@intel.com> References: <1467618513-4966-1-git-send-email-chris@chris-wilson.co.uk> <1467618513-4966-2-git-send-email-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 ESMTP id 77CFF89C69 for ; Tue, 5 Jul 2016 10:01:36 +0000 (UTC) In-Reply-To: <1467618513-4966-2-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 Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gUmVtb3Zl IHNvbWUgcmVkdW5kYW50IGtlcm5lbCBtZXNzYWdlcyBhcyB3ZSBkZWR1Y2UgYSBodW5nIEdQVSBh bmQKPiBjYXB0dXJlIHRoZSBlcnJvciBzdGF0ZS4KPgo+IHYyOiBGaXggImhhbmciIHZzICJubyBw cm9ncmVzcyIgbWVzc2FnZSB3aGlsc3QgSSB3YXMgdGhlcmUKPiB2Mzogcy9zbnByaW50Zi9zY25w cmludGYvCj4KPiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KPiBDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5j b20+Cj4gLS0tCgpSZXZpZXdlZC1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRl bC5jb20+Cgo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgNDEgKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDI2IGlu c2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCj4g aW5kZXggZjA1MzVkZjQxZGZkLi4wZTA3MTBhY2Y3ZjEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf aXJxLmMKPiBAQCAtMzA4NCw5ICszMDg0LDggQEAgc3RhdGljIHZvaWQgaTkxNV9oYW5nY2hlY2tf ZWxhcHNlZChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gIAkJY29udGFpbmVyX29mKHdvcmss IHR5cGVvZigqZGV2X3ByaXYpLAo+ICAJCQkgICAgIGdwdV9lcnJvci5oYW5nY2hlY2tfd29yay53 b3JrKTsKPiAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKPiAtCWVudW0gaW50ZWxf ZW5naW5lX2lkIGlkOwo+IC0JaW50IGJ1c3lfY291bnQgPSAwLCByaW5nc19odW5nID0gMDsKPiAt CWJvb2wgc3R1Y2tbSTkxNV9OVU1fRU5HSU5FU10gPSB7IDAgfTsKPiArCXVuc2lnbmVkIGludCBo dW5nID0gMCwgc3R1Y2sgPSAwOwo+ICsJaW50IGJ1c3lfY291bnQgPSAwOwo+ICAjZGVmaW5lIEJV U1kgMQo+ICAjZGVmaW5lIEtJQ0sgNQo+ICAjZGVmaW5lIEhVTkcgMjAKPiBAQCAtMzEwNCw3ICsz MTAzLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9oYW5nY2hlY2tfZWxhcHNlZChzdHJ1Y3Qgd29ya19z dHJ1Y3QgKndvcmspCj4gIAkgKi8KPiAgCWludGVsX3VuY29yZV9hcm1fdW5jbGFpbWVkX21taW9f ZGV0ZWN0aW9uKGRldl9wcml2KTsKPiAgCj4gLQlmb3JfZWFjaF9lbmdpbmVfaWQoZW5naW5lLCBk ZXZfcHJpdiwgaWQpIHsKPiArCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7Cj4g IAkJYm9vbCBidXN5ID0gaW50ZWxfZW5naW5lX2hhc193YWl0ZXIoZW5naW5lKTsKPiAgCQl1NjQg YWN0aGQ7Cj4gIAkJdTMyIHNlcW5vOwo+IEBAIC0zMTY3LDEwICszMTY2LDE1IEBAIHN0YXRpYyB2 b2lkIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ICAJ CQkJCWJyZWFrOwo+ICAJCQkJY2FzZSBIQU5HQ0hFQ0tfSFVORzoKPiAgCQkJCQllbmdpbmUtPmhh bmdjaGVjay5zY29yZSArPSBIVU5HOwo+IC0JCQkJCXN0dWNrW2lkXSA9IHRydWU7Cj4gIAkJCQkJ YnJlYWs7Cj4gIAkJCQl9Cj4gIAkJCX0KPiArCj4gKwkJCWlmIChlbmdpbmUtPmhhbmdjaGVjay5z Y29yZSA+PSBIQU5HQ0hFQ0tfU0NPUkVfUklOR19IVU5HKSB7Cj4gKwkJCQlodW5nIHw9IGludGVs X2VuZ2luZV9mbGFnKGVuZ2luZSk7Cj4gKwkJCQlpZiAoZW5naW5lLT5oYW5nY2hlY2suYWN0aW9u ICE9IEhBTkdDSEVDS19IVU5HKQo+ICsJCQkJCXN0dWNrIHw9IGludGVsX2VuZ2luZV9mbGFnKGVu Z2luZSk7Cj4gKwkJCX0KPiAgCQl9IGVsc2Ugewo+ICAJCQllbmdpbmUtPmhhbmdjaGVjay5hY3Rp b24gPSBIQU5HQ0hFQ0tfQUNUSVZFOwo+ICAKPiBAQCAtMzE5NSwxNyArMzE5OSwyNCBAQCBzdGF0 aWMgdm9pZCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykK PiAgCQlidXN5X2NvdW50ICs9IGJ1c3k7Cj4gIAl9Cj4gIAo+IC0JZm9yX2VhY2hfZW5naW5lX2lk KGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7Cj4gLQkJaWYgKGVuZ2luZS0+aGFuZ2NoZWNrLnNjb3Jl ID49IEhBTkdDSEVDS19TQ09SRV9SSU5HX0hVTkcpIHsKPiAtCQkJRFJNX0lORk8oIiVzIG9uICVz XG4iLAo+IC0JCQkJIHN0dWNrW2lkXSA/ICJzdHVjayIgOiAibm8gcHJvZ3Jlc3MiLAo+IC0JCQkJ IGVuZ2luZS0+bmFtZSk7Cj4gLQkJCXJpbmdzX2h1bmcgfD0gaW50ZWxfZW5naW5lX2ZsYWcoZW5n aW5lKTsKPiAtCQl9Cj4gLQl9Cj4gKwlpZiAoaHVuZykgewo+ICsJCWNoYXIgbXNnWzgwXTsKPiAr CQlpbnQgbGVuOwo+ICAKPiAtCWlmIChyaW5nc19odW5nKQo+IC0JCWk5MTVfaGFuZGxlX2Vycm9y KGRldl9wcml2LCByaW5nc19odW5nLCAiRW5naW5lKHMpIGh1bmciKTsKPiArCQkvKiBJZiBzb21l IHJpbmdzIGh1bmcgYnV0IG90aGVycyB3ZXJlIHN0aWxsIGJ1c3ksIG9ubHkKPiArCQkgKiBibGFt ZSB0aGUgaGFuZ2luZyByaW5ncyBpbiB0aGUgc3lub3BzaXMuCj4gKwkJICovCj4gKwkJaWYgKHN0 dWNrICE9IGh1bmcpCj4gKwkJCWh1bmcgJj0gfnN0dWNrOwo+ICsJCWxlbiA9IHNjbnByaW50Ziht c2csIHNpemVvZihtc2cpLAo+ICsJCQkJIiVzIG9uICIsIHN0dWNrID09IGh1bmcgPyAiTm8gcHJv Z3Jlc3MiIDogIkhhbmciKTsKPiArCQlmb3JfZWFjaF9lbmdpbmVfbWFza2VkKGVuZ2luZSwgZGV2 X3ByaXYsIGh1bmcpCj4gKwkJCWxlbiArPSBzY25wcmludGYobXNnICsgbGVuLCBzaXplb2YobXNn KSAtIGxlbiwKPiArCQkJCQkgIiVzLCAiLCBlbmdpbmUtPm5hbWUpOwo+ICsJCW1zZ1tsZW4tMl0g PSAnXDAnOwo+ICsKPiArCQlyZXR1cm4gaTkxNV9oYW5kbGVfZXJyb3IoZGV2X3ByaXYsIGh1bmcs IG1zZyk7Cj4gKwl9Cj4gIAo+ICAJLyogUmVzZXQgdGltZXIgaW4gY2FzZSBHUFUgaGFuZ3Mgd2l0 aG91dCBhbm90aGVyIHJlcXVlc3QgYmVpbmcgYWRkZWQgKi8KPiAgCWlmIChidXN5X2NvdW50KQo+ IC0tIAo+IDIuOC4xCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=