From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH v3] drm/i915/guc: Propagate the fw xfer timeout
Date: Thu, 18 Oct 2018 20:55:36 +0100
Message-ID: <20181018195536.11522-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 51C28898B6
 for <intel-gfx@lists.freedesktop.org>; Thu, 18 Oct 2018 19:55:47 +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
cm0vaTkxNS9pbnRlbF9ndWNfZncuYwppbmRleCBhOWU2ZmNjZTQ2N2MuLjUxYjI5MjAwMWVkZCAx
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
ZmVyPyAqLworCSpzdGF0dXMgPSBJOTE1X1JFQUQoRE1BX0NUUkwpOworCXJldHVybiAhKCpzdGF0
dXMgJiBTVEFSVF9ETUEpOwogfQogCiAvKgpAQCAtMjI4LDkgKzE4OCw1MSBAQCBzdGF0aWMgaW50
IGd1Y193YWl0X3Vjb2RlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJcmV0ID0gLUVOT0VYRUM7
CiAJfQogCisJaWYgKHJldCA9PSAwICYmICFndWNfeGZlcl9jb21wbGV0ZWQoZ3VjLCAmc3RhdHVz
KSkgeworCQlEUk1fRVJST1IoIkd1QyBpcyByZWFkeSwgYnV0IHRoZSB4ZmVyICUwOHggaXMgaW5j
b21wbGV0ZVxuIiwKKwkJCSAgc3RhdHVzKTsKKwkJcmV0ID0gLUVOWElPOworCX0KKwogCXJldHVy
biByZXQ7CiB9CiAKKy8qCisgKiBUcmFuc2ZlciB0aGUgZmlybXdhcmUgaW1hZ2UgdG8gUkFNIGZv
ciBleGVjdXRpb24gYnkgdGhlIG1pY3JvY29udHJvbGxlci4KKyAqCisgKiBBcmNoaXRlY3R1cmFs
bHksIHRoZSBETUEgZW5naW5lIGlzIGJpZGlyZWN0aW9uYWwsIGFuZCBjYW4gcG90ZW50aWFsbHkg
ZXZlbgorICogdHJhbnNmZXIgYmV0d2VlbiBHVFQgbG9jYXRpb25zLiBUaGlzIGZ1bmN0aW9uYWxp
dHkgaXMgbGVmdCBvdXQgb2YgdGhlIEFQSQorICogZm9yIG5vdyBhcyB0aGVyZSBpcyBubyBuZWVk
IGZvciBpdC4KKyAqLworc3RhdGljIGludCBndWNfeGZlcl91Y29kZShzdHJ1Y3QgaW50ZWxfZ3Vj
ICpndWMsIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7CisJc3RydWN0IGludGVsX3VjX2Z3ICpndWNf
ZncgPSAmZ3VjLT5mdzsKKwl1bnNpZ25lZCBsb25nIG9mZnNldDsKKworCS8qCisJICogVGhlIGhl
YWRlciBwbHVzIHVDb2RlIHdpbGwgYmUgY29waWVkIHRvIFdPUENNIHZpYSBETUEsIGV4Y2x1ZGlu
ZyBhbnkKKwkgKiBvdGhlciBjb21wb25lbnRzCisJICovCisJSTkxNV9XUklURShETUFfQ09QWV9T
SVpFLCBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9zaXplKTsKKworCS8qIFNl
dCB0aGUgc291cmNlIGFkZHJlc3MgZm9yIHRoZSBuZXcgYmxvYiAqLworCW9mZnNldCA9IGludGVs
X2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkgKyBndWNfZnctPmhlYWRlcl9vZmZzZXQ7CisJSTkx
NV9XUklURShETUFfQUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQpKTsKKwlJOTE1X1dS
SVRFKERNQV9BRERSXzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKKwor
CS8qCisJICogU2V0IHRoZSBETUEgZGVzdGluYXRpb24uIEN1cnJlbnQgdUNvZGUgZXhwZWN0cyB0
aGUgY29kZSB0byBiZQorCSAqIGxvYWRlZCBhdCA4azsgbG9jYXRpb25zIGJlbG93IHRoaXMgYXJl
IHVzZWQgZm9yIHRoZSBzdGFjay4KKwkgKi8KKwlJOTE1X1dSSVRFKERNQV9BRERSXzFfTE9XLCAw
eDIwMDApOworCUk5MTVfV1JJVEUoRE1BX0FERFJfMV9ISUdILCBETUFfQUREUkVTU19TUEFDRV9X
T1BDTSk7CisKKwkvKiBGaW5hbGx5IHN0YXJ0IHRoZSBETUEgKi8KKwlJOTE1X1dSSVRFKERNQV9D
VFJMLCBfTUFTS0VEX0JJVF9FTkFCTEUoVU9TX01PVkUgfCBTVEFSVF9ETUEpKTsKKworCXJldHVy
biBndWNfd2FpdF91Y29kZShndWMpOworfQogLyoKICAqIExvYWQgdGhlIEd1QyBmaXJtd2FyZSBi
bG9iIGludG8gdGhlIE1pbnV0ZUlBLgogICovCkBAIC0yNTEsMTcgKzI1Myw5IEBAIHN0YXRpYyBp
bnQgZ3VjX2Z3X3hmZXIoc3RydWN0IGludGVsX3VjX2Z3ICpndWNfZncsIHN0cnVjdCBpOTE1X3Zt
YSAqdm1hKQogCSAqIGJ5IHRoZSBETUEgZW5naW5lIGluIG9uZSBvcGVyYXRpb24sIHdoZXJlYXMg
dGhlIFJTQSBzaWduYXR1cmUgaXMKIAkgKiBsb2FkZWQgdmlhIE1NSU8uCiAJICovCi0JcmV0ID0g
Z3VjX3hmZXJfcnNhKGd1Yywgdm1hKTsKLQlpZiAocmV0KQotCQlEUk1fV0FSTigiR3VDIGZpcm13
YXJlIHNpZ25hdHVyZSB4ZmVyIGVycm9yICVkXG4iLCByZXQpOworCWd1Y194ZmVyX3JzYShndWMs
IHZtYSk7CiAKIAlyZXQgPSBndWNfeGZlcl91Y29kZShndWMsIHZtYSk7Ci0JaWYgKHJldCkKLQkJ
RFJNX1dBUk4oIkd1QyBmaXJtd2FyZSBjb2RlIHhmZXIgZXJyb3IgJWRcbiIsIHJldCk7Ci0KLQly
ZXQgPSBndWNfd2FpdF91Y29kZShndWMpOwotCWlmIChyZXQpCi0JCURSTV9FUlJPUigiR3VDIGZp
cm13YXJlIHhmZXIgZXJyb3IgJWRcbiIsIHJldCk7CiAKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtl
X3B1dChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAKLS0gCjIuMTkuMQoKX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz
dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0
b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==