From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 29/33] drm/i915: Only record active and pending
	requests upon a GPU hang
Date: Sun,  7 Aug 2016 15:45:37 +0100
Message-ID: <1470581141-14432-30-git-send-email-chris@chris-wilson.co.uk>
References: <1470581141-14432-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com
 [IPv6:2a00:1450:400c:c09::241])
 by gabe.freedesktop.org (Postfix) with ESMTPS id EE2B86E2EC
 for <intel-gfx@lists.freedesktop.org>; Sun,  7 Aug 2016 14:46:20 +0000 (UTC)
Received: by mail-wm0-x241.google.com with SMTP id i5so11073671wmg.2
 for <intel-gfx@lists.freedesktop.org>; Sun, 07 Aug 2016 07:46:20 -0700 (PDT)
In-Reply-To: <1470581141-14432-1-git-send-email-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhlcmUgaXMgbm8gb3RoZXIgc3RhdGUgcGVydGFpbmluZyB0byB0aGUgY29tcGxldGVkIHJlcXVl
c3RzIGluIHRoZQpoYW5nLCBvdGhlciB0aGFuIGdsZWFtZWQgdGhyb3VnaCB0aGUgcmluZ2J1ZmZl
ciwgc28gaW5jbHVkaW5nIHRoZQpleHBpcmVkIHJlcXVlc3RzIGluIHRoZSBsaXN0IG9mIG91dHN0
YW5kaW5nIHJlcXVlc3RzIHNpbXBseSBhZGRzIG5vaXNlLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMg
V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDEwNSArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t
LS0tCiAxIGZpbGUgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggNTJkMTU2NGYzN2M0Li41ZDhm
ZDBiZWRhMmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9y
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtMTAzNCwx
MiArMTAzNCw2NSBAQCBzdGF0aWMgdm9pZCBlcnJvcl9yZWNvcmRfZW5naW5lX3JlZ2lzdGVycyhz
dHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmVycm9yLAogCX0KIH0KIAorc3RhdGljIHZvaWQg
ZW5naW5lX3JlY29yZF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJ
CQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpmaXJzdCwKKwkJCQkgICBzdHJ1Y3Qg
ZHJtX2k5MTVfZXJyb3JfZW5naW5lICplZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl
c3QgKnJlcXVlc3Q7CisJaW50IGNvdW50OworCisJY291bnQgPSAwOworCXJlcXVlc3QgPSBmaXJz
dDsKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5X2Zyb20ocmVxdWVzdCwgJmVuZ2luZS0+cmVxdWVzdF9s
aXN0LCBsaW5rKQorCQljb3VudCsrOworCisJZWUtPnJlcXVlc3RzID0gTlVMTDsKKwlrY2FsbG9j
KGNvdW50LCBzaXplb2YoKmVlLT5yZXF1ZXN0cyksCisJCUdGUF9BVE9NSUMpOworCWlmIChlZS0+
cmVxdWVzdHMgPT0gTlVMTCkKKwkJcmV0dXJuOworCWVlLT5udW1fcmVxdWVzdHMgPSBjb3VudDsK
KworCWNvdW50ID0gMDsKKwlyZXF1ZXN0ID0gZmlyc3Q7CisJbGlzdF9mb3JfZWFjaF9lbnRyeV9m
cm9tKHJlcXVlc3QsICZlbmdpbmUtPnJlcXVlc3RfbGlzdCwgbGluaykgeworCQlzdHJ1Y3QgZHJt
X2k5MTVfZXJyb3JfcmVxdWVzdCAqZXJxOworCisJCWlmIChjb3VudCA+PSBlZS0+bnVtX3JlcXVl
c3RzKSB7CisJCQkvKgorCQkJICogSWYgdGhlIHJpbmcgcmVxdWVzdCBsaXN0IHdhcyBjaGFuZ2Vk
IGluCisJCQkgKiBiZXR3ZWVuIHRoZSBwb2ludCB3aGVyZSB0aGUgZXJyb3IgcmVxdWVzdAorCQkJ
ICogbGlzdCB3YXMgY3JlYXRlZCBhbmQgZGltZW5zaW9uZWQgYW5kIHRoaXMKKwkJCSAqIHBvaW50
IHRoZW4ganVzdCBleGl0IGVhcmx5IHRvIGF2b2lkIGNyYXNoZXMuCisJCQkgKgorCQkJICogV2Ug
ZG9uJ3QgbmVlZCB0byBjb21tdW5pY2F0ZSB0aGF0IHRoZQorCQkJICogcmVxdWVzdCBsaXN0IGNo
YW5nZWQgc3RhdGUgZHVyaW5nIGVycm9yCisJCQkgKiBzdGF0ZSBjYXB0dXJlIGFuZCB0aGF0IHRo
ZSBlcnJvciBzdGF0ZSBpcworCQkJICogc2xpZ2h0bHkgaW5jb3JyZWN0IGFzIGEgY29uc2VxdWVu
Y2Ugc2luY2Ugd2UKKwkJCSAqIGFyZSB0eXBpY2FsbHkgb25seSBpbnRlcmVzdGVkIGluIHRoZSBy
ZXF1ZXN0CisJCQkgKiBsaXN0IHN0YXRlIGF0IHRoZSBwb2ludCBvZiBlcnJvciBzdGF0ZQorCQkJ
ICogY2FwdHVyZSwgbm90IGluIGFueSBjaGFuZ2VzIGhhcHBlbmluZyBkdXJpbmcKKwkJCSAqIHRo
ZSBjYXB0dXJlLgorCQkJICovCisJCQlicmVhazsKKwkJfQorCisJCWVycSA9ICZlZS0+cmVxdWVz
dHNbY291bnQrK107CisJCWVycS0+c2Vxbm8gPSByZXF1ZXN0LT5mZW5jZS5zZXFubzsKKwkJZXJx
LT5qaWZmaWVzID0gcmVxdWVzdC0+ZW1pdHRlZF9qaWZmaWVzOworCQllcnEtPnRhaWwgPSByZXF1
ZXN0LT50YWlsOworCisJCXJjdV9yZWFkX2xvY2soKTsKKwkJZXJxLT5waWQgPSByZXF1ZXN0LT5j
dHggPyBwaWRfbnIocmVxdWVzdC0+Y3R4LT5waWQpIDogMDsKKwkJcmN1X3JlYWRfdW5sb2NrKCk7
CisJfQorfQorCiBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZWNvcmRfcmluZ3Moc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRl
ICplcnJvcikKIHsKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0Owot
CXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKLQlpbnQgaSwgY291bnQ7CisJ
aW50IGk7CiAKIAllcnJvci0+c2VtYXBob3JlID0KIAkJaTkxNV9lcnJvcl9vYmplY3RfY3JlYXRl
KGRldl9wcml2LCBkZXZfcHJpdi0+c2VtYXBob3JlKTsKQEAgLTEwNDcsNiArMTEwMCw3IEBAIHN0
YXRpYyB2b2lkIGk5MTVfZ2VtX3JlY29yZF9yaW5ncyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
ZGV2X3ByaXYsCiAJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX0VOR0lORVM7IGkrKykgewogCQlz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSAmZGV2X3ByaXYtPmVuZ2luZVtpXTsKIAkJ
c3RydWN0IGRybV9pOTE1X2Vycm9yX2VuZ2luZSAqZWUgPSAmZXJyb3ItPmVuZ2luZVtpXTsKKwkJ
c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0OwogCiAJCWVlLT5waWQgPSAtMTsK
IAkJZWUtPmVuZ2luZV9pZCA9IC0xOwpAQCAtMTEwNSw2ICsxMTU5LDggQEAgc3RhdGljIHZvaWQg
aTkxNV9nZW1fcmVjb3JkX3JpbmdzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK
IAkJCWVlLT5jcHVfcmluZ190YWlsID0gcmluZy0+dGFpbDsKIAkJCWVlLT5yaW5nYnVmZmVyID0K
IAkJCQlpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoZGV2X3ByaXYsIHJpbmctPnZtYSk7CisKKwkJ
CWVuZ2luZV9yZWNvcmRfcmVxdWVzdHMoZW5naW5lLCByZXF1ZXN0LCBlZSk7CiAJCX0KIAogCQll
ZS0+aHdzX3BhZ2UgPQpAQCAtMTExMyw1MSArMTE2OSw2IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2Vt
X3JlY29yZF9yaW5ncyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAkJZWUt
PndhX2N0eCA9CiAJCQlpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoZGV2X3ByaXYsIGVuZ2luZS0+
d2FfY3R4LnZtYSk7Ci0KLQkJY291bnQgPSAwOwotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJlcXVl
c3QsICZlbmdpbmUtPnJlcXVlc3RfbGlzdCwgbGluaykKLQkJCWNvdW50Kys7Ci0KLQkJZWUtPm51
bV9yZXF1ZXN0cyA9IGNvdW50OwotCQllZS0+cmVxdWVzdHMgPQotCQkJa2NhbGxvYyhjb3VudCwg
c2l6ZW9mKCplZS0+cmVxdWVzdHMpLCBHRlBfQVRPTUlDKTsKLQkJaWYgKCFlZS0+cmVxdWVzdHMp
IHsKLQkJCWVlLT5udW1fcmVxdWVzdHMgPSAwOwotCQkJY29udGludWU7Ci0JCX0KLQotCQljb3Vu
dCA9IDA7Ci0JCWxpc3RfZm9yX2VhY2hfZW50cnkocmVxdWVzdCwgJmVuZ2luZS0+cmVxdWVzdF9s
aXN0LCBsaW5rKSB7Ci0JCQlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfcmVxdWVzdCAqZXJxOwotCi0J
CQlpZiAoY291bnQgPj0gZWUtPm51bV9yZXF1ZXN0cykgewotCQkJCS8qCi0JCQkJICogSWYgdGhl
IHJpbmcgcmVxdWVzdCBsaXN0IHdhcyBjaGFuZ2VkIGluCi0JCQkJICogYmV0d2VlbiB0aGUgcG9p
bnQgd2hlcmUgdGhlIGVycm9yIHJlcXVlc3QKLQkJCQkgKiBsaXN0IHdhcyBjcmVhdGVkIGFuZCBk
aW1lbnNpb25lZCBhbmQgdGhpcwotCQkJCSAqIHBvaW50IHRoZW4ganVzdCBleGl0IGVhcmx5IHRv
IGF2b2lkIGNyYXNoZXMuCi0JCQkJICoKLQkJCQkgKiBXZSBkb24ndCBuZWVkIHRvIGNvbW11bmlj
YXRlIHRoYXQgdGhlCi0JCQkJICogcmVxdWVzdCBsaXN0IGNoYW5nZWQgc3RhdGUgZHVyaW5nIGVy
cm9yCi0JCQkJICogc3RhdGUgY2FwdHVyZSBhbmQgdGhhdCB0aGUgZXJyb3Igc3RhdGUgaXMKLQkJ
CQkgKiBzbGlnaHRseSBpbmNvcnJlY3QgYXMgYSBjb25zZXF1ZW5jZSBzaW5jZSB3ZQotCQkJCSAq
IGFyZSB0eXBpY2FsbHkgb25seSBpbnRlcmVzdGVkIGluIHRoZSByZXF1ZXN0Ci0JCQkJICogbGlz
dCBzdGF0ZSBhdCB0aGUgcG9pbnQgb2YgZXJyb3Igc3RhdGUKLQkJCQkgKiBjYXB0dXJlLCBub3Qg
aW4gYW55IGNoYW5nZXMgaGFwcGVuaW5nIGR1cmluZwotCQkJCSAqIHRoZSBjYXB0dXJlLgotCQkJ
CSAqLwotCQkJCWJyZWFrOwotCQkJfQotCi0JCQllcnEgPSAmZWUtPnJlcXVlc3RzW2NvdW50Kytd
OwotCQkJZXJxLT5zZXFubyA9IHJlcXVlc3QtPmZlbmNlLnNlcW5vOwotCQkJZXJxLT5qaWZmaWVz
ID0gcmVxdWVzdC0+ZW1pdHRlZF9qaWZmaWVzOwotCQkJZXJxLT50YWlsID0gcmVxdWVzdC0+cG9z
dGZpeDsKLQotCQkJcmN1X3JlYWRfbG9jaygpOwotCQkJZXJxLT5waWQgPSByZXF1ZXN0LT5jdHgg
PyBwaWRfbnIocmVxdWVzdC0+Y3R4LT5waWQpIDogMDsKLQkJCXJjdV9yZWFkX3VubG9jaygpOwot
CQl9CiAJfQogfQogCi0tIAoyLjguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu
Zm8vaW50ZWwtZ2Z4Cg==