From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 4/6] drm/i915: Include engine state on detecting a missed breadcrumb/seqno Date: Tue, 21 Nov 2017 09:39:39 +0000 Message-ID: <20171121093941.15459-4-chris@chris-wilson.co.uk> References: <20171121093941.15459-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id D142E6E3AE for ; Tue, 21 Nov 2017 09:40:06 +0000 (UTC) In-Reply-To: <20171121093941.15459-1-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 Cc: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org Tm93IHRoYXQgd2UgaGF2ZSBhIGNvbW1vbiBlbmdpbmUgc3RhdGUgcHJldHR5IHByaW50ZXIsIHdl IGNhbiB1c2UgdGhhdAppbnN0ZWFkIG9mIHRoZSBhZGhvYyBpbmZvcm1hdGlvbiBwcmludGVkIHdo ZW4gd2UgbWlzcyBhIGJyZWFkY3J1bWIuCgp2MjogUmVhcnJhbmdlIGludGVsX2VuZ2luZV9kaXNh cm1fYnJlYWRjcnVtYnMoKSB0byBhdm9pZCBjYWxsaW5nCmludGVsX2VuZ2luZV9kdW1wKCkgdW5k ZXIgdGhlIHJiIHNwaW5sb2NrIChNaWthKSBhbmQgdG8gcHJldHR5LXByaW50IHRoZQplcnJvciBz dGF0ZSBlYXJseSBzbyB0aGF0IHdlIGluY2x1ZGUgdGhlIGZ1bGwgbGlzdCBvZiB3YWl0ZXJzLgp2 MzogUGFzcyBtaXNzZWQgYnJlYWRjcnVtYiBtc2cgdG8gcHJldHR5LXByaW50ZXIgYXMgdGhlIGhl YWRlcgp2NDogUHJlc2VydmUgRFJNX0RFQlVHX0RSSVZFUiBmaWx0ZXJpbmcuCgpTaWduZWQtb2Zm LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3Vv cHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRr by51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9icmVh ZGNydW1icy5jIHwgMjUgKysrKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgICB8ICA2ICsrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAy MCBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfYnJlYWRjcnVtYnMuYwppbmRleCA1YWUyZDI3NmY3ZjMuLjI0YzZmZWZkZDBiMSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jCkBAIC02NCwxMiArNjQsMTMgQEAg c3RhdGljIHVuc2lnbmVkIGxvbmcgd2FpdF90aW1lb3V0KHZvaWQpCiAKIHN0YXRpYyBub2lubGlu ZSB2b2lkIG1pc3NlZF9icmVhZGNydW1iKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IHsKLQlEUk1fREVCVUdfRFJJVkVSKCIlcyBtaXNzZWQgYnJlYWRjcnVtYiBhdCAlcFMsIGlycSBw b3N0ZWQ/ICVzLCBjdXJyZW50IHNlcW5vPSV4LCBsYXN0PSV4XG4iLAotCQkJIGVuZ2luZS0+bmFt ZSwgX19idWlsdGluX3JldHVybl9hZGRyZXNzKDApLAotCQkJIHllc25vKHRlc3RfYml0KEVOR0lO RV9JUlFfQlJFQURDUlVNQiwKLQkJCQkJJmVuZ2luZS0+aXJxX3Bvc3RlZCkpLAotCQkJIGludGVs X2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKSwKLQkJCSBpbnRlbF9lbmdpbmVfbGFzdF9zdWJtaXQo ZW5naW5lKSk7CisJaWYgKGRybV9kZWJ1ZyAmIERSTV9VVF9EUklWRVIpIHsKKwkJc3RydWN0IGRy bV9wcmludGVyIHAgPSBkcm1fZGVidWdfcHJpbnRlcihfX2Z1bmNfXyk7CisKKwkJaW50ZWxfZW5n aW5lX2R1bXAoZW5naW5lLCAmcCwKKwkJCQkgICIlcyBtaXNzZWQgYnJlYWRjcnVtYiBhdCAlcFNc biIsCisJCQkJICBlbmdpbmUtPm5hbWUsIF9fYnVpbHRpbl9yZXR1cm5fYWRkcmVzcygwKSk7CisJ fQogCiAJc2V0X2JpdChlbmdpbmUtPmlkLCAmZW5naW5lLT5pOTE1LT5ncHVfZXJyb3IubWlzc2Vk X2lycV9yaW5ncyk7CiB9CkBAIC0yMTMsMjggKzIxNCwzMCBAQCB2b2lkIGludGVsX2VuZ2luZV91 bnBpbl9icmVhZGNydW1ic19pcnEoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogdm9p ZCBpbnRlbF9lbmdpbmVfZGlzYXJtX2JyZWFkY3J1bWJzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfYnJlYWRjcnVtYnMgKmIgPSAmZW5naW5lLT5icmVh ZGNydW1iczsKLQlzdHJ1Y3QgaW50ZWxfd2FpdCAqd2FpdCwgKm4sICpmaXJzdDsKKwlzdHJ1Y3Qg aW50ZWxfd2FpdCAqd2FpdCwgKm47CiAKIAlpZiAoIWItPmlycV9hcm1lZCkKIAkJcmV0dXJuOwog Ci0JLyogV2Ugb25seSBkaXNhcm0gdGhlIGlycSB3aGVuIHdlIGFyZSBpZGxlIChhbGwgcmVxdWVz dHMgY29tcGxldGVkKSwKKwkvKgorCSAqIFdlIG9ubHkgZGlzYXJtIHRoZSBpcnEgd2hlbiB3ZSBh cmUgaWRsZSAoYWxsIHJlcXVlc3RzIGNvbXBsZXRlZCksCiAJICogc28gaWYgdGhlIGJvdHRvbS1o YWxmIHJlbWFpbnMgYXNsZWVwLCBpdCBtaXNzZWQgdGhlIHJlcXVlc3QKIAkgKiBjb21wbGV0aW9u LgogCSAqLworCWlmIChpbnRlbF9lbmdpbmVfd2FrZXVwKGVuZ2luZSkgJiBFTkdJTkVfV0FLRVVQ X0FTTEVFUCkKKwkJbWlzc2VkX2JyZWFkY3J1bWIoZW5naW5lKTsKIAogCXNwaW5fbG9ja19pcnEo JmItPnJiX2xvY2spOwogCiAJc3Bpbl9sb2NrKCZiLT5pcnFfbG9jayk7Ci0JZmlyc3QgPSBmZXRj aF9hbmRfemVybygmYi0+aXJxX3dhaXQpOworCWItPmlycV93YWl0ID0gTlVMTDsKIAlpZiAoYi0+ aXJxX2FybWVkKQogCQlfX2ludGVsX2VuZ2luZV9kaXNhcm1fYnJlYWRjcnVtYnMoZW5naW5lKTsK IAlzcGluX3VubG9jaygmYi0+aXJxX2xvY2spOwogCiAJcmJ0cmVlX3Bvc3RvcmRlcl9mb3JfZWFj aF9lbnRyeV9zYWZlKHdhaXQsIG4sICZiLT53YWl0ZXJzLCBub2RlKSB7CiAJCVJCX0NMRUFSX05P REUoJndhaXQtPm5vZGUpOwotCQlpZiAod2FrZV91cF9wcm9jZXNzKHdhaXQtPnRzaykgJiYgd2Fp dCA9PSBmaXJzdCkKLQkJCW1pc3NlZF9icmVhZGNydW1iKGVuZ2luZSk7CisJCXdha2VfdXBfcHJv Y2Vzcyh3YWl0LT50c2spOwogCX0KIAliLT53YWl0ZXJzID0gUkJfUk9PVDsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwppbmRleCBlOWQ1Y2QyODI5MWYuLmFhNDkwMTIwNzQ5 YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKQEAgLTE4MjIsNiArMTgy MiwxMiBAQCB2b2lkIGludGVsX2VuZ2luZV9kdW1wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSwKIAl9CiAJc3Bpbl91bmxvY2tfaXJxKCZiLT5yYl9sb2NrKTsKIAorCWRybV9wcmludGYo bSwgIklSUT8gMHglbHggKGJyZWFkY3J1bWJzPyAlcykgKGV4ZWNsaXN0cz8gJXMpXG4iLAorCQkg ICBlbmdpbmUtPmlycV9wb3N0ZWQsCisJCSAgIHllc25vKHRlc3RfYml0KEVOR0lORV9JUlFfQlJF QURDUlVNQiwKKwkJCQkgICZlbmdpbmUtPmlycV9wb3N0ZWQpKSwKKwkJICAgeWVzbm8odGVzdF9i aXQoRU5HSU5FX0lSUV9FWEVDTElTVCwKKwkJCQkgICZlbmdpbmUtPmlycV9wb3N0ZWQpKSk7CiAJ ZHJtX3ByaW50ZihtLCAiSWRsZT8gJXNcbiIsIHllc25vKGludGVsX2VuZ2luZV9pc19pZGxlKGVu Z2luZSkpKTsKIAlkcm1fcHJpbnRmKG0sICJcbiIpOwogfQotLSAKMi4xNS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK