From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH v2] drm/i915/guc: Propagate the fw xfer timeout
Date: Thu, 18 Oct 2018 20:54:39 +0100
Message-ID: <20181018195439.11384-1-chris@chris-wilson.co.uk>
References: <20181017202902.16138-1-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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id B87AA6E0E3
 for <intel-gfx@lists.freedesktop.org>; Thu, 18 Oct 2018 19:54:54 +0000 (UTC)
In-Reply-To: <20181017202902.16138-1-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

UHJvcGFnYXRlIHRoZSB0aW1lb3V0IG9uIHRyYW5zZmVycmluZyB0aGUgZncgYmFjayB0byB0aGUg
Y2FsbGVyIHdoZXJlIGl0Cm1heSBhY3QgdXBvbiBpdCwgdXN1YWxseSBieSByZXN0YXJ0aW5nIHRo
ZSB4ZmVyIGJlZm9yZSBmYWlsaW5nLgoKdjI6IFNpbXBsaWZ5IHRoZSB3YWl0IHRvIG9ubHkgd2Fp
dCB1cG9uIHRoZSBndWMgc2lnbmFsaW5nIGNvbXBsZXRpb24sCndpdGggYW4gYXNzZXJ0aW9uIHRo
YXQgdGhlIGZ3IHhmZXIgbXVzdCBoYXZlIGNvbXBsZXRlZCBmb3IgaXQgdG8gYmUKcmVhZHkhCgpU
ZXN0Y2FzZTogaWd0L2Rydl9zZWxmdGVzdC9saXZlX2hhbmdjaGVjawpTaWduZWQtb2ZmLWJ5OiBD
aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pY2hhbCBXYWpkZWN6
a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJp
byA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9ndWNfZncuYyB8IDEwNiArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAx
IGZpbGUgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9ndWNfZncuYwppbmRleCBhOWU2ZmNjZTQ2N2MuLjIxYTVkY2Y3ODMyMiAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKQEAgLTEyNSw2NiArMTI1LDI2IEBAIHN0
YXRpYyB2b2lkIGd1Y19wcmVwYXJlX3hmZXIoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogfQogCiAv
KiBDb3B5IFJTQSBzaWduYXR1cmUgZnJvbSB0aGUgZncgaW1hZ2UgdG8gSFcgZm9yIHZlcmlmaWNh
dGlvbiAqLwotc3RhdGljIGludCBndWNfeGZlcl9yc2Eoc3RydWN0IGludGVsX2d1YyAqZ3VjLCBz
dHJ1Y3QgaTkxNV92bWEgKnZtYSkKK3N0YXRpYyB2b2lkIGd1Y194ZmVyX3JzYShzdHJ1Y3QgaW50
ZWxfZ3VjICpndWMsIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogewogCXN0cnVjdCBkcm1faTkxNV9w
cml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7Ci0Jc3RydWN0IGludGVsX3VjX2Z3
ICpndWNfZncgPSAmZ3VjLT5mdzsKLQlzdHJ1Y3Qgc2dfdGFibGUgKnNnID0gdm1hLT5wYWdlczsK
IAl1MzIgcnNhW1VPU19SU0FfU0NSQVRDSF9DT1VOVF07CiAJaW50IGk7CiAKLQlpZiAoc2dfcGNv
cHlfdG9fYnVmZmVyKHNnLT5zZ2wsIHNnLT5uZW50cywgcnNhLCBzaXplb2YocnNhKSwKLQkJCSAg
ICAgICBndWNfZnctPnJzYV9vZmZzZXQpICE9IHNpemVvZihyc2EpKQotCQlyZXR1cm4gLUVJTlZB
TDsKKwlzZ19wY29weV90b19idWZmZXIodm1hLT5wYWdlcy0+c2dsLCB2bWEtPnBhZ2VzLT5uZW50
cywKKwkJCSAgIHJzYSwgc2l6ZW9mKHJzYSksIGd1Yy0+ZncucnNhX29mZnNldCk7CiAKIAlmb3Ig
KGkgPSAwOyBpIDwgVU9TX1JTQV9TQ1JBVENIX0NPVU5UOyBpKyspCiAJCUk5MTVfV1JJVEUoVU9T
X1JTQV9TQ1JBVENIKGkpLCByc2FbaV0pOwotCi0JcmV0dXJuIDA7CiB9CiAKLS8qCi0gKiBUcmFu
c2ZlciB0aGUgZmlybXdhcmUgaW1hZ2UgdG8gUkFNIGZvciBleGVjdXRpb24gYnkgdGhlIG1pY3Jv
Y29udHJvbGxlci4KLSAqCi0gKiBBcmNoaXRlY3R1cmFsbHksIHRoZSBETUEgZW5naW5lIGlzIGJp
ZGlyZWN0aW9uYWwsIGFuZCBjYW4gcG90ZW50aWFsbHkgZXZlbgotICogdHJhbnNmZXIgYmV0d2Vl
biBHVFQgbG9jYXRpb25zLiBUaGlzIGZ1bmN0aW9uYWxpdHkgaXMgbGVmdCBvdXQgb2YgdGhlIEFQ
SQotICogZm9yIG5vdyBhcyB0aGVyZSBpcyBubyBuZWVkIGZvciBpdC4KLSAqLwotc3RhdGljIGlu
dCBndWNfeGZlcl91Y29kZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHN0cnVjdCBpOTE1X3ZtYSAq
dm1hKQorc3RhdGljIGJvb2wgZ3VjX3hmZXJfY29tcGxldGVkKHN0cnVjdCBpbnRlbF9ndWMgKmd1
YywgdTMyICpzdGF0dXMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g
Z3VjX3RvX2k5MTUoZ3VjKTsKLQlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9ICZndWMtPmZ3
OwotCXVuc2lnbmVkIGxvbmcgb2Zmc2V0OwotCXUzMiBzdGF0dXM7Ci0JaW50IHJldDsKLQotCS8q
Ci0JICogVGhlIGhlYWRlciBwbHVzIHVDb2RlIHdpbGwgYmUgY29waWVkIHRvIFdPUENNIHZpYSBE
TUEsIGV4Y2x1ZGluZyBhbnkKLQkgKiBvdGhlciBjb21wb25lbnRzCi0JICovCi0JSTkxNV9XUklU
RShETUFfQ09QWV9TSVpFLCBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9zaXpl
KTsKLQotCS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3MgZm9yIHRoZSBuZXcgYmxvYiAqLwotCW9m
ZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkgKyBndWNfZnctPmhlYWRlcl9v
ZmZzZXQ7Ci0JSTkxNV9XUklURShETUFfQUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQp
KTsKLQlJOTE1X1dSSVRFKERNQV9BRERSXzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYg
MHhGRkZGKTsKIAotCS8qCi0JICogU2V0IHRoZSBETUEgZGVzdGluYXRpb24uIEN1cnJlbnQgdUNv
ZGUgZXhwZWN0cyB0aGUgY29kZSB0byBiZQotCSAqIGxvYWRlZCBhdCA4azsgbG9jYXRpb25zIGJl
bG93IHRoaXMgYXJlIHVzZWQgZm9yIHRoZSBzdGFjay4KLQkgKi8KLQlJOTE1X1dSSVRFKERNQV9B
RERSXzFfTE9XLCAweDIwMDApOwotCUk5MTVfV1JJVEUoRE1BX0FERFJfMV9ISUdILCBETUFfQURE
UkVTU19TUEFDRV9XT1BDTSk7Ci0KLQkvKiBGaW5hbGx5IHN0YXJ0IHRoZSBETUEgKi8KLQlJOTE1
X1dSSVRFKERNQV9DVFJMLCBfTUFTS0VEX0JJVF9FTkFCTEUoVU9TX01PVkUgfCBTVEFSVF9ETUEp
KTsKLQotCS8qIFdhaXQgZm9yIERNQSB0byBmaW5pc2ggKi8KLQlyZXQgPSBfX2ludGVsX3dhaXRf
Zm9yX3JlZ2lzdGVyX2Z3KGRldl9wcml2LCBETUFfQ1RSTCwgU1RBUlRfRE1BLCAwLAotCQkJCQkg
ICAyLCAxMDAsICZzdGF0dXMpOwotCURSTV9ERUJVR19EUklWRVIoIkd1QyBETUEgc3RhdHVzICUj
eFxuIiwgc3RhdHVzKTsKLQotCXJldHVybiByZXQ7CisJLyogRGlkIHdlIGNvbXBsZXRlIHRoZSB4
ZmVyPyAqLworCSpzdGF0dXMgPSBJOTE1X1JFQUQoRE1BX0NUUkwpOworCXJldHVybiAhISgqc3Rh
dHVzICYgU1RBUlRfRE1BKTsKIH0KIAogLyoKQEAgLTIyOCw5ICsxODgsNTEgQEAgc3RhdGljIGlu
dCBndWNfd2FpdF91Y29kZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCXJldCA9IC1FTk9FWEVD
OwogCX0KIAorCWlmIChyZXQgPT0gMCAmJiAhZ3VjX3hmZXJfY29tcGxldGVkKGd1YywgJnN0YXR1
cykpIHsKKwkJRFJNX0VSUk9SKCJHdUMgaXMgcmVhZHksIGJ1dCB0aGUgeGZlciAlMDh4IGlzIGlu
Y29tcGxldGVcbiIsCisJCQkgIHN0YXR1cyk7CisJCXJldCA9IC1FTlhJTzsKKwl9CisKIAlyZXR1
cm4gcmV0OwogfQogCisvKgorICogVHJhbnNmZXIgdGhlIGZpcm13YXJlIGltYWdlIHRvIFJBTSBm
b3IgZXhlY3V0aW9uIGJ5IHRoZSBtaWNyb2NvbnRyb2xsZXIuCisgKgorICogQXJjaGl0ZWN0dXJh
bGx5LCB0aGUgRE1BIGVuZ2luZSBpcyBiaWRpcmVjdGlvbmFsLCBhbmQgY2FuIHBvdGVudGlhbGx5
IGV2ZW4KKyAqIHRyYW5zZmVyIGJldHdlZW4gR1RUIGxvY2F0aW9ucy4gVGhpcyBmdW5jdGlvbmFs
aXR5IGlzIGxlZnQgb3V0IG9mIHRoZSBBUEkKKyAqIGZvciBub3cgYXMgdGhlcmUgaXMgbm8gbmVl
ZCBmb3IgaXQuCisgKi8KK3N0YXRpYyBpbnQgZ3VjX3hmZXJfdWNvZGUoc3RydWN0IGludGVsX2d1
YyAqZ3VjLCBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0
ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3Vj
X2Z3ID0gJmd1Yy0+Znc7CisJdW5zaWduZWQgbG9uZyBvZmZzZXQ7CisKKwkvKgorCSAqIFRoZSBo
ZWFkZXIgcGx1cyB1Q29kZSB3aWxsIGJlIGNvcGllZCB0byBXT1BDTSB2aWEgRE1BLCBleGNsdWRp
bmcgYW55CisJICogb3RoZXIgY29tcG9uZW50cworCSAqLworCUk5MTVfV1JJVEUoRE1BX0NPUFlf
U0laRSwgZ3VjX2Z3LT5oZWFkZXJfc2l6ZSArIGd1Y19mdy0+dWNvZGVfc2l6ZSk7CisKKwkvKiBT
ZXQgdGhlIHNvdXJjZSBhZGRyZXNzIGZvciB0aGUgbmV3IGJsb2IgKi8KKwlvZmZzZXQgPSBpbnRl
bF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpICsgZ3VjX2Z3LT5oZWFkZXJfb2Zmc2V0OworCUk5
MTVfV1JJVEUoRE1BX0FERFJfMF9MT1csIGxvd2VyXzMyX2JpdHMob2Zmc2V0KSk7CisJSTkxNV9X
UklURShETUFfQUREUl8wX0hJR0gsIHVwcGVyXzMyX2JpdHMob2Zmc2V0KSAmIDB4RkZGRik7CisK
KwkvKgorCSAqIFNldCB0aGUgRE1BIGRlc3RpbmF0aW9uLiBDdXJyZW50IHVDb2RlIGV4cGVjdHMg
dGhlIGNvZGUgdG8gYmUKKwkgKiBsb2FkZWQgYXQgOGs7IGxvY2F0aW9ucyBiZWxvdyB0aGlzIGFy
ZSB1c2VkIGZvciB0aGUgc3RhY2suCisJICovCisJSTkxNV9XUklURShETUFfQUREUl8xX0xPVywg
MHgyMDAwKTsKKwlJOTE1X1dSSVRFKERNQV9BRERSXzFfSElHSCwgRE1BX0FERFJFU1NfU1BBQ0Vf
V09QQ00pOworCisJLyogRmluYWxseSBzdGFydCB0aGUgRE1BICovCisJSTkxNV9XUklURShETUFf
Q1RSTCwgX01BU0tFRF9CSVRfRU5BQkxFKFVPU19NT1ZFIHwgU1RBUlRfRE1BKSk7CisKKwlyZXR1
cm4gZ3VjX3dhaXRfdWNvZGUoZ3VjKTsKK30KIC8qCiAgKiBMb2FkIHRoZSBHdUMgZmlybXdhcmUg
YmxvYiBpbnRvIHRoZSBNaW51dGVJQS4KICAqLwpAQCAtMjUxLDE3ICsyNTMsOSBAQCBzdGF0aWMg
aW50IGd1Y19md194ZmVyKHN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3LCBzdHJ1Y3QgaTkxNV92
bWEgKnZtYSkKIAkgKiBieSB0aGUgRE1BIGVuZ2luZSBpbiBvbmUgb3BlcmF0aW9uLCB3aGVyZWFz
IHRoZSBSU0Egc2lnbmF0dXJlIGlzCiAJICogbG9hZGVkIHZpYSBNTUlPLgogCSAqLwotCXJldCA9
IGd1Y194ZmVyX3JzYShndWMsIHZtYSk7Ci0JaWYgKHJldCkKLQkJRFJNX1dBUk4oIkd1QyBmaXJt
d2FyZSBzaWduYXR1cmUgeGZlciBlcnJvciAlZFxuIiwgcmV0KTsKKwlndWNfeGZlcl9yc2EoZ3Vj
LCB2bWEpOwogCiAJcmV0ID0gZ3VjX3hmZXJfdWNvZGUoZ3VjLCB2bWEpOwotCWlmIChyZXQpCi0J
CURSTV9XQVJOKCJHdUMgZmlybXdhcmUgY29kZSB4ZmVyIGVycm9yICVkXG4iLCByZXQpOwotCi0J
cmV0ID0gZ3VjX3dhaXRfdWNvZGUoZ3VjKTsKLQlpZiAocmV0KQotCQlEUk1fRVJST1IoIkd1QyBm
aXJtd2FyZSB4ZmVyIGVycm9yICVkXG4iLCByZXQpOwogCiAJaW50ZWxfdW5jb3JlX2ZvcmNld2Fr
ZV9wdXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogCi0tIAoyLjE5LjEKCl9fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp
c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=