From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 11/62] drm/i915: Clean up GPU hang message Date: Fri, 3 Jun 2016 17:36:36 +0100 Message-ID: <1464971847-15809-12-git-send-email-chris@chris-wilson.co.uk> References: <1464971847-15809-1-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 mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C33E6E534 for ; Fri, 3 Jun 2016 16:37:46 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id e3so607930wme.2 for ; Fri, 03 Jun 2016 09:37:46 -0700 (PDT) In-Reply-To: <1464971847-15809-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org UmVtb3ZlIHNvbWUgcmVkdW5kYW50IGtlcm5lbCBtZXNzYWdlcyBhcyB3ZSBkZWR1Y2UgYSBodW5n IEdQVSBhbmQKY2FwdHVyZSB0aGUgZXJyb3Igc3RhdGUuCgp2MjogRml4ICJoYW5nIiB2cyAibm8g cHJvZ3Jlc3MiIG1lc3NhZ2Ugd2hpbHN0IEkgd2FzIHRoZXJlCgpTaWduZWQtb2ZmLWJ5OiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCAzNGUyNWZjMmI5MGEuLjg2MDIzNWQxZTBiZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0zMDgzLDkgKzMwODMsOCBAQCBzdGF0aWMgdm9p ZCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJY29u dGFpbmVyX29mKHdvcmssIHR5cGVvZigqZGV2X3ByaXYpLAogCQkJICAgICBncHVfZXJyb3IuaGFu Z2NoZWNrX3dvcmsud29yayk7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCWVu dW0gaW50ZWxfZW5naW5lX2lkIGlkOwotCWludCBidXN5X2NvdW50ID0gMCwgcmluZ3NfaHVuZyA9 IDA7Ci0JYm9vbCBzdHVja1tJOTE1X05VTV9FTkdJTkVTXSA9IHsgMCB9OworCXVuc2lnbmVkIGh1 bmcgPSAwLCBzdHVjayA9IDA7CisJaW50IGJ1c3lfY291bnQgPSAwOwogI2RlZmluZSBCVVNZIDEK ICNkZWZpbmUgS0lDSyA1CiAjZGVmaW5lIEhVTkcgMjAKQEAgLTMxMDMsNyArMzEwMiw3IEBAIHN0 YXRpYyB2b2lkIGk5MTVfaGFuZ2NoZWNrX2VsYXBzZWQoc3RydWN0IHdvcmtfc3RydWN0ICp3b3Jr KQogCSAqLwogCWludGVsX3VuY29yZV9hcm1fdW5jbGFpbWVkX21taW9fZGV0ZWN0aW9uKGRldl9w cml2KTsKIAotCWZvcl9lYWNoX2VuZ2luZV9pZChlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCWZv cl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CiAJCWJvb2wgYnVzeSA9IGludGVsX2Vu Z2luZV9oYXNfd2FpdGVyKGVuZ2luZSk7CiAJCXU2NCBhY3RoZDsKIAkJdTMyIHNlcW5vOwpAQCAt MzE2NiwxMCArMzE2NSwxNSBAQCBzdGF0aWMgdm9pZCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKHN0 cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJCQkJYnJlYWs7CiAJCQkJY2FzZSBIQU5HQ0hFQ0tf SFVORzoKIAkJCQkJZW5naW5lLT5oYW5nY2hlY2suc2NvcmUgKz0gSFVORzsKLQkJCQkJc3R1Y2tb aWRdID0gdHJ1ZTsKIAkJCQkJYnJlYWs7CiAJCQkJfQogCQkJfQorCisJCQlpZiAoZW5naW5lLT5o YW5nY2hlY2suc2NvcmUgPj0gSEFOR0NIRUNLX1NDT1JFX1JJTkdfSFVORykgeworCQkJCWh1bmcg fD0gaW50ZWxfZW5naW5lX2ZsYWcoZW5naW5lKTsKKwkJCQlpZiAoZW5naW5lLT5oYW5nY2hlY2su YWN0aW9uICE9IEhBTkdDSEVDS19IVU5HKQorCQkJCQlzdHVjayB8PSBpbnRlbF9lbmdpbmVfZmxh ZyhlbmdpbmUpOworCQkJfQogCQl9IGVsc2UgewogCQkJZW5naW5lLT5oYW5nY2hlY2suYWN0aW9u ID0gSEFOR0NIRUNLX0FDVElWRTsKIApAQCAtMzE5NCwxNyArMzE5OCwyNCBAQCBzdGF0aWMgdm9p ZCBpOTE1X2hhbmdjaGVja19lbGFwc2VkKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkJYnVz eV9jb3VudCArPSBidXN5OwogCX0KIAotCWZvcl9lYWNoX2VuZ2luZV9pZChlbmdpbmUsIGRldl9w cml2LCBpZCkgewotCQlpZiAoZW5naW5lLT5oYW5nY2hlY2suc2NvcmUgPj0gSEFOR0NIRUNLX1ND T1JFX1JJTkdfSFVORykgewotCQkJRFJNX0lORk8oIiVzIG9uICVzXG4iLAotCQkJCSBzdHVja1tp ZF0gPyAic3R1Y2siIDogIm5vIHByb2dyZXNzIiwKLQkJCQkgZW5naW5lLT5uYW1lKTsKLQkJCXJp bmdzX2h1bmcgfD0gaW50ZWxfZW5naW5lX2ZsYWcoZW5naW5lKTsKLQkJfQotCX0KKwlpZiAoaHVu ZykgeworCQljaGFyIG1zZ1s4MF07CisJCWludCBsZW47CiAKLQlpZiAocmluZ3NfaHVuZykKLQkJ aTkxNV9oYW5kbGVfZXJyb3IoZGV2X3ByaXYsIHJpbmdzX2h1bmcsICJFbmdpbmUocykgaHVuZyIp OworCQkvKiBJZiBzb21lIHJpbmdzIGh1bmcgYnV0IG90aGVycyB3ZXJlIHN0aWxsIGJ1c3ksIG9u bHkKKwkJICogYmxhbWUgdGhlIGhhbmdpbmcgcmluZ3MgaW4gdGhlIHN5bm9wc2lzLgorCQkgKi8K KwkJaWYgKHN0dWNrICE9IGh1bmcpCisJCQlodW5nICY9IH5zdHVjazsKKwkJbGVuID0gc25wcmlu dGYobXNnLCBzaXplb2YobXNnKSwKKwkJCSAgICAgICAiJXMgb24gIiwgc3R1Y2sgPT0gaHVuZyA/ ICJObyBwcm9ncmVzcyIgOiAiSGFuZyIpOworCQlmb3JfZWFjaF9lbmdpbmVfbWFza2VkKGVuZ2lu ZSwgZGV2X3ByaXYsIGh1bmcpCisJCQlsZW4gKz0gc25wcmludGYobXNnICsgbGVuLCBzaXplb2Yo bXNnKSAtIGxlbiwKKwkJCQkJIiVzLCAiLCBlbmdpbmUtPm5hbWUpOworCQltc2dbbGVuLTJdID0g J1wwJzsKKworCQlyZXR1cm4gaTkxNV9oYW5kbGVfZXJyb3IoZGV2X3ByaXYsIGh1bmcsIG1zZyk7 CisJfQogCiAJLyogUmVzZXQgdGltZXIgaW4gY2FzZSBHUFUgaGFuZ3Mgd2l0aG91dCBhbm90aGVy IHJlcXVlc3QgYmVpbmcgYWRkZWQgKi8KIAlpZiAoYnVzeV9jb3VudCkKLS0gCjIuOC4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK