From: Tvrtko Ursulin Subject: [PATCH] drm/i915/guc: Fix request re-submission after reset Date: Thu, 9 Mar 2017 10:05:21 +0000 Message-ID: <20170309100521.26792-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 1402F6EBAA for ; Thu, 9 Mar 2017 10:05:42 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u132so10067441wmg.1 for ; Thu, 09 Mar 2017 02:05:41 -0800 (PST) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkluIG9yZGVy IHRvIGVuc3VyZSBubyBtaXNzZWQgaW50ZXJydXB0cyB3ZSBtdXN0IGZpcnN0IHJlLWRpcmVjdAp0 aGUgaW50ZXJydXB0cyB0byBHdUMsIGFuZCBvbmx5IHRoZW4gcmUtc3VibWl0IHRoZSByZXF1ZXN0 cyB0bwpiZSByZXBsYXllZCBhZnRlciBhIEdQVSByZXNldC4gT3RoZXJ3aXNlIGNvbnRleHQgc3dp dGNoIGNhbiBmaXJlCmJlZm9yZSBHdUMgaGFzIGJlZW4gc2V0IHVwIHRvIHJlY2VpdmUgaXQgdHJp Z2dlcmluZyBtb3JlIGhhbmdzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRr by51cnN1bGluQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgpDYzogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+ CkNjOiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IE9z Y2FyIE1hdGVvIDxvc2Nhci5tYXRlb0BpbnRlbC5jb20+CkNjOiBTYWdhciBBcnVuIEthbWJsZSA8 c2FnYXIuYS5rYW1ibGVAaW50ZWwuY29tPgpDYzogQXJrYWRpdXN6IEhpbGVyIDxhcmthZGl1c3ou aGlsZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYyB8IDU4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jICAgIHwgNDcgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiAyIGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDUxIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBiZWIzOGUz MGQwZTkuLjViOGVjMGZhYjU2MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1 Ym1pc3Npb24uYwpAQCAtOTM2LDYgKzkzNiw1MiBAQCBzdGF0aWMgdm9pZCBndWNfcmVzZXRfd3Eo c3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogCWNsaWVudC0+d3FfdGFpbCA9IDA7CiB9 CiAKK3N0YXRpYyB2b2lkIGd1Y19pbnRlcnJ1cHRzX2NhcHR1cmUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQoreworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKKwll bnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKwlpbnQgaXJxczsKKwl1MzIgdG1wOworCisJLyogdGVs bCBhbGwgY29tbWFuZCBzdHJlYW1lcnMgdG8gZm9yd2FyZCBpbnRlcnJ1cHRzIChidXQgbm90IHZi bGFuaykgdG8gR3VDICovCisJaXJxcyA9IF9NQVNLRURfQklUX0VOQUJMRShHRlhfSU5URVJSVVBU X1NURUVSSU5HKTsKKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCisJCUk5 MTVfV1JJVEUoUklOR19NT0RFX0dFTjcoZW5naW5lKSwgaXJxcyk7CisKKwkvKiByb3V0ZSBVU0VS X0lOVEVSUlVQVCB0byBIb3N0LCBhbGwgb3RoZXJzIGFyZSBzZW50IHRvIEd1Qy4gKi8KKwlpcnFz ID0gR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfUkNTX0lSUV9TSElGVCB8CisJICAg ICAgIEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X0JDU19JUlFfU0hJRlQ7CisJLyog VGhlc2UgdGhyZWUgcmVnaXN0ZXJzIGhhdmUgdGhlIHNhbWUgYml0IGRlZmluaXRpb25zICovCisJ STkxNV9XUklURShHVUNfQkNTX1JDU19JRVIsIH5pcnFzKTsKKwlJOTE1X1dSSVRFKEdVQ19WQ1My X1ZDUzFfSUVSLCB+aXJxcyk7CisJSTkxNV9XUklURShHVUNfV0RfVkVDU19JRVIsIH5pcnFzKTsK KworCS8qCisJICogVGhlIFJFRElSRUNUX1RPX0dVQyBiaXQgb2YgdGhlIFBNSU5UUk1TSyByZWdp c3RlciBkaXJlY3RzIGFsbAorCSAqICh1bm1hc2tlZCkgUE0gaW50ZXJydXB0cyB0byB0aGUgR3VD LiBBbGwgb3RoZXIgYml0cyBvZiB0aGlzCisJICogcmVnaXN0ZXIgKmRpc2FibGUqIGdlbmVyYXRp b24gb2YgYSBzcGVjaWZpYyBpbnRlcnJ1cHQuCisJICoKKwkgKiAncG1faW50cl9rZWVwJyBpbmRp Y2F0ZXMgYml0cyB0aGF0IGFyZSBOT1QgdG8gYmUgc2V0IHdoZW4KKwkgKiB3cml0aW5nIHRvIHRo ZSBQTSBpbnRlcnJ1cHQgbWFzayByZWdpc3RlciwgaS5lLiBpbnRlcnJ1cHRzCisJICogdGhhdCBt dXN0IG5vdCBiZSBkaXNhYmxlZC4KKwkgKgorCSAqIElmIHRoZSBHdUMgaXMgaGFuZGxpbmcgdGhl c2UgaW50ZXJydXB0cywgdGhlbiB3ZSBtdXN0IG5vdCBsZXQKKwkgKiB0aGUgUE0gY29kZSBkaXNh YmxlIEFOWSBpbnRlcnJ1cHQgdGhhdCB0aGUgR3VDIGlzIGV4cGVjdGluZy4KKwkgKiBTbyBmb3Ig ZWFjaCBFTkFCTEVEICgwKSBiaXQgaW4gdGhpcyByZWdpc3Rlciwgd2UgbXVzdCBTRVQgdGhlCisJ ICogYml0IGluIHBtX2ludHJfa2VlcCBzbyB0aGF0IGl0J3MgbGVmdCBlbmFibGVkIGZvciB0aGUg R3VDLgorCSAqCisJICogT1RPSCB0aGUgUkVESVJFQ1RfVE9fR1VDIGJpdCBpcyBpbml0aWFsbHkg U0VUIGluIHBtX2ludHJfa2VlcAorCSAqIChzbyBpbnRlcnJ1cHRzIGdvIHRvIHRoZSBESVNQTEFZ IHVuaXQgYXQgZmlyc3QpOyBidXQgaGVyZSB3ZQorCSAqIG5lZWQgdG8gQ0xFQVIgdGhhdCBiaXQs IHdoaWNoIHdpbGwgcmVzdWx0IGluIHRoZSByZWdpc3RlciBiaXQKKwkgKiBiZWluZyBsZWZ0IFNF VCEKKwkgKi8KKwl0bXAgPSBJOTE1X1JFQUQoR0VONl9QTUlOVFJNU0spOworCWlmICh0bXAgJiBH RU44X1BNSU5UUl9SRURJUkVDVF9UT19HVUMpIHsKKwkJZGV2X3ByaXYtPnJwcy5wbV9pbnRyX2tl ZXAgfD0gfnRtcDsKKwkJZGV2X3ByaXYtPnJwcy5wbV9pbnRyX2tlZXAgJj0gfkdFTjhfUE1JTlRS X1JFRElSRUNUX1RPX0dVQzsKKwl9Cit9CisKIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2VuYWJs ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2d1 YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7CkBAIC05NTMsMTMgKzk5OSwxNyBAQCBpbnQgaTkxNV9n dWNfc3VibWlzc2lvbl9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CiAJLyogVGFrZSBvdmVyIGZyb20gbWFudWFsIGNvbnRyb2wgb2YgRUxTUCAoZXhlY2xpc3RzKSAq LwogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgewotCQljb25zdCBpbnQg d3FpX3NpemUgPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKLQkJc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpycTsKLQogCQllbmdpbmUtPnN1Ym1pdF9yZXF1ZXN0ID0gaTkxNV9ndWNf c3VibWl0OwogCQllbmdpbmUtPnNjaGVkdWxlID0gTlVMTDsKKwl9CisKKwlndWNfaW50ZXJydXB0 c19jYXB0dXJlKGRldl9wcml2KTsKKworCS8qIFJlcGxheSB0aGUgY3VycmVudCBzZXQgb2YgcHJl dmlvdXNseSBzdWJtaXR0ZWQgcmVxdWVzdHMgKi8KKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBk ZXZfcHJpdiwgaWQpIHsKKwkJY29uc3QgaW50IHdxaV9zaXplID0gc2l6ZW9mKHN0cnVjdCBndWNf d3FfaXRlbSk7CisJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnE7CiAKLQkJLyogUmVw bGF5IHRoZSBjdXJyZW50IHNldCBvZiBwcmV2aW91c2x5IHN1Ym1pdHRlZCByZXF1ZXN0cyAqLwog CQlzcGluX2xvY2tfaXJxKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrKTsKIAkJbGlzdF9mb3JfZWFj aF9lbnRyeShycSwgJmVuZ2luZS0+dGltZWxpbmUtPnJlcXVlc3RzLCBsaW5rKSB7CiAJCQlndWNf Y2xpZW50X3VwZGF0ZV93cV9yc3ZkKGNsaWVudCwgd3FpX3NpemUpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDk4ODVmNzYwZjJlZi4uMmUyNDcxMmNmM2VlIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC0xMDksNTIgKzEwOSw2 IEBAIHN0YXRpYyB2b2lkIGd1Y19pbnRlcnJ1cHRzX3JlbGVhc2Uoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCUk5MTVfV1JJVEUoR1VDX1dEX1ZFQ1NfSUVSLCAwKTsKIH0KIAot c3RhdGljIHZvaWQgZ3VjX2ludGVycnVwdHNfY2FwdHVyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCi17Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCWVudW0g aW50ZWxfZW5naW5lX2lkIGlkOwotCWludCBpcnFzOwotCXUzMiB0bXA7Ci0KLQkvKiB0ZWxsIGFs bCBjb21tYW5kIHN0cmVhbWVycyB0byBmb3J3YXJkIGludGVycnVwdHMgKGJ1dCBub3QgdmJsYW5r KSB0byBHdUMgKi8KLQlpcnFzID0gX01BU0tFRF9CSVRfRU5BQkxFKEdGWF9JTlRFUlJVUFRfU1RF RVJJTkcpOwotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKLQkJSTkxNV9X UklURShSSU5HX01PREVfR0VONyhlbmdpbmUpLCBpcnFzKTsKLQotCS8qIHJvdXRlIFVTRVJfSU5U RVJSVVBUIHRvIEhvc3QsIGFsbCBvdGhlcnMgYXJlIHNlbnQgdG8gR3VDLiAqLwotCWlycXMgPSBH VF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9SQ1NfSVJRX1NISUZUIHwKLQkgICAgICAg R1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfQkNTX0lSUV9TSElGVDsKLQkvKiBUaGVz ZSB0aHJlZSByZWdpc3RlcnMgaGF2ZSB0aGUgc2FtZSBiaXQgZGVmaW5pdGlvbnMgKi8KLQlJOTE1 X1dSSVRFKEdVQ19CQ1NfUkNTX0lFUiwgfmlycXMpOwotCUk5MTVfV1JJVEUoR1VDX1ZDUzJfVkNT MV9JRVIsIH5pcnFzKTsKLQlJOTE1X1dSSVRFKEdVQ19XRF9WRUNTX0lFUiwgfmlycXMpOwotCi0J LyoKLQkgKiBUaGUgUkVESVJFQ1RfVE9fR1VDIGJpdCBvZiB0aGUgUE1JTlRSTVNLIHJlZ2lzdGVy IGRpcmVjdHMgYWxsCi0JICogKHVubWFza2VkKSBQTSBpbnRlcnJ1cHRzIHRvIHRoZSBHdUMuIEFs bCBvdGhlciBiaXRzIG9mIHRoaXMKLQkgKiByZWdpc3RlciAqZGlzYWJsZSogZ2VuZXJhdGlvbiBv ZiBhIHNwZWNpZmljIGludGVycnVwdC4KLQkgKgotCSAqICdwbV9pbnRyX2tlZXAnIGluZGljYXRl cyBiaXRzIHRoYXQgYXJlIE5PVCB0byBiZSBzZXQgd2hlbgotCSAqIHdyaXRpbmcgdG8gdGhlIFBN IGludGVycnVwdCBtYXNrIHJlZ2lzdGVyLCBpLmUuIGludGVycnVwdHMKLQkgKiB0aGF0IG11c3Qg bm90IGJlIGRpc2FibGVkLgotCSAqCi0JICogSWYgdGhlIEd1QyBpcyBoYW5kbGluZyB0aGVzZSBp bnRlcnJ1cHRzLCB0aGVuIHdlIG11c3Qgbm90IGxldAotCSAqIHRoZSBQTSBjb2RlIGRpc2FibGUg QU5ZIGludGVycnVwdCB0aGF0IHRoZSBHdUMgaXMgZXhwZWN0aW5nLgotCSAqIFNvIGZvciBlYWNo IEVOQUJMRUQgKDApIGJpdCBpbiB0aGlzIHJlZ2lzdGVyLCB3ZSBtdXN0IFNFVCB0aGUKLQkgKiBi aXQgaW4gcG1faW50cl9rZWVwIHNvIHRoYXQgaXQncyBsZWZ0IGVuYWJsZWQgZm9yIHRoZSBHdUMu Ci0JICoKLQkgKiBPVE9IIHRoZSBSRURJUkVDVF9UT19HVUMgYml0IGlzIGluaXRpYWxseSBTRVQg aW4gcG1faW50cl9rZWVwCi0JICogKHNvIGludGVycnVwdHMgZ28gdG8gdGhlIERJU1BMQVkgdW5p dCBhdCBmaXJzdCk7IGJ1dCBoZXJlIHdlCi0JICogbmVlZCB0byBDTEVBUiB0aGF0IGJpdCwgd2hp Y2ggd2lsbCByZXN1bHQgaW4gdGhlIHJlZ2lzdGVyIGJpdAotCSAqIGJlaW5nIGxlZnQgU0VUIQot CSAqLwotCXRtcCA9IEk5MTVfUkVBRChHRU42X1BNSU5UUk1TSyk7Ci0JaWYgKHRtcCAmIEdFTjhf UE1JTlRSX1JFRElSRUNUX1RPX0dVQykgewotCQlkZXZfcHJpdi0+cnBzLnBtX2ludHJfa2VlcCB8 PSB+dG1wOwotCQlkZXZfcHJpdi0+cnBzLnBtX2ludHJfa2VlcCAmPSB+R0VOOF9QTUlOVFJfUkVE SVJFQ1RfVE9fR1VDOwotCX0KLX0KLQogc3RhdGljIHUzMiBnZXRfZ3R0eXBlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAkvKiBYWFg6IEdUIHR5cGUgYmFzZWQgb24gUENJ IGRldmljZSBJRD8gZmllbGQgc2VlbXMgdW51c2VkIGJ5IGZ3ICovCkBAIC01MjksNyArNDgzLDYg QEAgaW50IGludGVsX2d1Y19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJCWVyciA9IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKGRldl9wcml2KTsKIAkJaWYgKGVy cikKIAkJCWdvdG8gZmFpbDsKLQkJZ3VjX2ludGVycnVwdHNfY2FwdHVyZShkZXZfcHJpdik7CiAJ fQogCiAJRFJNX0lORk8oIkd1QyAlcyAoZmlybXdhcmUgJXMgW3ZlcnNpb24gJXUuJXVdKVxuIiwK LS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK