From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tursulin@ursulin.net>
Subject: [CI 1/2] drm/i915/guc: Fix request re-submission after
	reset
Date: Thu,  9 Mar 2017 13:20:04 +0000
Message-ID: <20170309132005.1317-1-tvrtko.ursulin@linux.intel.com>
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-x244.google.com (mail-wm0-x244.google.com
 [IPv6:2a00:1450:400c:c09::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 9099E89FD1
 for <Intel-gfx@lists.freedesktop.org>; Thu,  9 Mar 2017 13:20:13 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id z63so10905748wmg.2
 for <Intel-gfx@lists.freedesktop.org>; Thu, 09 Mar 2017 05:20:13 -0800 (PST)
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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkluIG9yZGVy
IHRvIGVuc3VyZSBubyBtaXNzZWQgaW50ZXJydXB0cyB3ZSBtdXN0IGZpcnN0IHJlLWRpcmVjdAp0
aGUgaW50ZXJydXB0cyB0byBHdUMsIGFuZCBvbmx5IHRoZW4gcmUtc3VibWl0IHRoZSByZXF1ZXN0
cyB0bwpiZSByZXBsYXllZCBhZnRlciBhIEdQVSByZXNldC4gT3RoZXJ3aXNlIGNvbnRleHQgc3dp
dGNoIGNhbiBmaXJlCmJlZm9yZSBHdUMgaGFzIGJlZW4gc2V0IHVwIHRvIHJlY2VpdmUgaXQgdHJp
Z2dlcmluZyBtb3JlIGhhbmdzLgoKdjI6IFJlYmFzZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBV
cnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlz
QGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6
a29AaW50ZWwuY29tPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRl
bC5jb20+CkNjOiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgpDYzogU2FnYXIg
QXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IEFya2FkaXVzeiBIaWxl
ciA8YXJrYWRpdXN6LmhpbGVyQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8
Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z3VjX3N1Ym1pc3Npb24uYyB8IDMyICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jICAgIHwgMjEgLS0tLS0tLS0tLS0t
LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25z
KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv
bi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGJl
YjM4ZTMwZDBlOS4uNDFmMmRkODdiNDEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
dWNfc3VibWlzc2lvbi5jCkBAIC05MzYsNiArOTM2LDI2IEBAIHN0YXRpYyB2b2lkIGd1Y19yZXNl
dF93cShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiAJY2xpZW50LT53cV90YWlsID0g
MDsKIH0KIAorc3RhdGljIHZvaWQgZ3VjX2ludGVycnVwdHNfY2FwdHVyZShzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l
OworCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOworCWludCBpcnFzOworCisJLyogdGVsbCBhbGwg
Y29tbWFuZCBzdHJlYW1lcnMgdG8gZm9yd2FyZCBpbnRlcnJ1cHRzIChidXQgbm90IHZibGFuaykg
dG8gR3VDICovCisJaXJxcyA9IF9NQVNLRURfQklUX0VOQUJMRShHRlhfSU5URVJSVVBUX1NURUVS
SU5HKTsKKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCisJCUk5MTVfV1JJ
VEUoUklOR19NT0RFX0dFTjcoZW5naW5lKSwgaXJxcyk7CisKKwkvKiByb3V0ZSBVU0VSX0lOVEVS
UlVQVCB0byBIb3N0LCBhbGwgb3RoZXJzIGFyZSBzZW50IHRvIEd1Qy4gKi8KKwlpcnFzID0gR1Rf
UkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfUkNTX0lSUV9TSElGVCB8CisJICAgICAgIEdU
X1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X0JDU19JUlFfU0hJRlQ7CisJLyogVGhlc2Ug
dGhyZWUgcmVnaXN0ZXJzIGhhdmUgdGhlIHNhbWUgYml0IGRlZmluaXRpb25zICovCisJSTkxNV9X
UklURShHVUNfQkNTX1JDU19JRVIsIH5pcnFzKTsKKwlJOTE1X1dSSVRFKEdVQ19WQ1MyX1ZDUzFf
SUVSLCB+aXJxcyk7CisJSTkxNV9XUklURShHVUNfV0RfVkVDU19JRVIsIH5pcnFzKTsKK30KKwog
aW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdikKIHsKIAlzdHJ1Y3QgaW50ZWxfZ3VjICpndWMgPSAmZGV2X3ByaXYtPmd1YzsKQEAg
LTk1MywxMyArOTczLDE3IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAkvKiBUYWtlIG92ZXIgZnJvbSBtYW51YWwg
Y29udHJvbCBvZiBFTFNQIChleGVjbGlzdHMpICovCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg
ZGV2X3ByaXYsIGlkKSB7Ci0JCWNvbnN0IGludCB3cWlfc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3Vj
X3dxX2l0ZW0pOwotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxOwotCiAJCWVuZ2lu
ZS0+c3VibWl0X3JlcXVlc3QgPSBpOTE1X2d1Y19zdWJtaXQ7CiAJCWVuZ2luZS0+c2NoZWR1bGUg
PSBOVUxMOworCX0KKworCWd1Y19pbnRlcnJ1cHRzX2NhcHR1cmUoZGV2X3ByaXYpOworCisJLyog
UmVwbGF5IHRoZSBjdXJyZW50IHNldCBvZiBwcmV2aW91c2x5IHN1Ym1pdHRlZCByZXF1ZXN0cyAq
LworCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkgeworCQljb25zdCBpbnQg
d3FpX3NpemUgPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKKwkJc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpycTsKIAotCQkvKiBSZXBsYXkgdGhlIGN1cnJlbnQgc2V0IG9mIHByZXZp
b3VzbHkgc3VibWl0dGVkIHJlcXVlc3RzICovCiAJCXNwaW5fbG9ja19pcnEoJmVuZ2luZS0+dGlt
ZWxpbmUtPmxvY2spOwogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJxLCAmZW5naW5lLT50aW1lbGlu
ZS0+cmVxdWVzdHMsIGxpbmspIHsKIAkJCWd1Y19jbGllbnRfdXBkYXRlX3dxX3JzdmQoY2xpZW50
LCB3cWlfc2l6ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNf
bG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXgg
NjRjZGVmNDc5ZDFkLi4yZTI0NzEyY2YzZWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n
dWNfbG9hZGVyLmMKQEAgLTEwOSwyNiArMTA5LDYgQEAgc3RhdGljIHZvaWQgZ3VjX2ludGVycnVw
dHNfcmVsZWFzZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJSTkxNV9XUklU
RShHVUNfV0RfVkVDU19JRVIsIDApOwogfQogCi1zdGF0aWMgdm9pZCBndWNfaW50ZXJydXB0c19j
YXB0dXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQlzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICplbmdpbmU7Ci0JZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7Ci0JaW50IGly
cXM7Ci0KLQkvKiB0ZWxsIGFsbCBjb21tYW5kIHN0cmVhbWVycyB0byBmb3J3YXJkIGludGVycnVw
dHMgKGJ1dCBub3QgdmJsYW5rKSB0byBHdUMgKi8KLQlpcnFzID0gX01BU0tFRF9CSVRfRU5BQkxF
KEdGWF9JTlRFUlJVUFRfU1RFRVJJTkcpOwotCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9w
cml2LCBpZCkKLQkJSTkxNV9XUklURShSSU5HX01PREVfR0VONyhlbmdpbmUpLCBpcnFzKTsKLQot
CS8qIHJvdXRlIFVTRVJfSU5URVJSVVBUIHRvIEhvc3QsIGFsbCBvdGhlcnMgYXJlIHNlbnQgdG8g
R3VDLiAqLwotCWlycXMgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9SQ1NfSVJR
X1NISUZUIHwKLQkgICAgICAgR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfQkNTX0lS
UV9TSElGVDsKLQkvKiBUaGVzZSB0aHJlZSByZWdpc3RlcnMgaGF2ZSB0aGUgc2FtZSBiaXQgZGVm
aW5pdGlvbnMgKi8KLQlJOTE1X1dSSVRFKEdVQ19CQ1NfUkNTX0lFUiwgfmlycXMpOwotCUk5MTVf
V1JJVEUoR1VDX1ZDUzJfVkNTMV9JRVIsIH5pcnFzKTsKLQlJOTE1X1dSSVRFKEdVQ19XRF9WRUNT
X0lFUiwgfmlycXMpOwotfQotCiBzdGF0aWMgdTMyIGdldF9ndHR5cGUoc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmRldl9wcml2KQogewogCS8qIFhYWDogR1QgdHlwZSBiYXNlZCBvbiBQQ0kgZGV2
aWNlIElEPyBmaWVsZCBzZWVtcyB1bnVzZWQgYnkgZncgKi8KQEAgLTUwMyw3ICs0ODMsNiBAQCBp
bnQgaW50ZWxfZ3VjX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJ
ZXJyID0gaTkxNV9ndWNfc3VibWlzc2lvbl9lbmFibGUoZGV2X3ByaXYpOwogCQlpZiAoZXJyKQog
CQkJZ290byBmYWlsOwotCQlndWNfaW50ZXJydXB0c19jYXB0dXJlKGRldl9wcml2KTsKIAl9CiAK
IAlEUk1fSU5GTygiR3VDICVzIChmaXJtd2FyZSAlcyBbdmVyc2lvbiAldS4ldV0pXG4iLAotLSAK
Mi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu
dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=