From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniele Ceraolo Spurio Subject: Re: [PATCH v3] drm/i915/guc: Propagate the fw xfer timeout Date: Thu, 18 Oct 2018 13:48:30 -0700 Message-ID: <7e7fcfdf-49bb-1a96-9af4-13e607456ee0@intel.com> References: <20181017202902.16138-1-chris@chris-wilson.co.uk> <20181018195536.11522-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id D7FC06E06C for ; Thu, 18 Oct 2018 20:48:31 +0000 (UTC) In-Reply-To: <20181018195536.11522-1-chris@chris-wilson.co.uk> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org CgpPbiAxOC8xMC8xOCAxMjo1NSwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+IFByb3BhZ2F0ZSB0aGUg dGltZW91dCBvbiB0cmFuc2ZlcnJpbmcgdGhlIGZ3IGJhY2sgdG8gdGhlIGNhbGxlciB3aGVyZSBp dAo+IG1heSBhY3QgdXBvbiBpdCwgdXN1YWxseSBieSByZXN0YXJ0aW5nIHRoZSB4ZmVyIGJlZm9y ZSBmYWlsaW5nLgo+IAo+IHYyOiBTaW1wbGlmeSB0aGUgd2FpdCB0byBvbmx5IHdhaXQgdXBvbiB0 aGUgZ3VjIHNpZ25hbGluZyBjb21wbGV0aW9uLAo+IHdpdGggYW4gYXNzZXJ0aW9uIHRoYXQgdGhl IGZ3IHhmZXIgbXVzdCBoYXZlIGNvbXBsZXRlZCBmb3IgaXQgdG8gYmUKPiByZWFkeSEKPiAKPiBU ZXN0Y2FzZTogaWd0L2Rydl9zZWxmdGVzdC9saXZlX2hhbmdjaGVjawo+IFNpZ25lZC1vZmYtYnk6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IENjOiBNaWNoYWwgV2Fq ZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KPiBDYzogRGFuaWVsZSBDZXJhb2xv IFNwdXJpbyA8ZGFuaWVsZS5jZXJhb2xvc3B1cmlvQGludGVsLmNvbT4KPiAtLS0KPiAgIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jIHwgMTA2ICsrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0KPiAgIDEgZmlsZSBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCA1NiBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYwo+IGluZGV4IGE5ZTZmY2Nl NDY3Yy4uNTFiMjkyMDAxZWRkIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19mdy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMK PiBAQCAtMTI1LDY2ICsxMjUsMjYgQEAgc3RhdGljIHZvaWQgZ3VjX3ByZXBhcmVfeGZlcihzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMpCj4gICB9Cj4gICAKPiAgIC8qIENvcHkgUlNBIHNpZ25hdHVyZSBm cm9tIHRoZSBmdyBpbWFnZSB0byBIVyBmb3IgdmVyaWZpY2F0aW9uICovCj4gLXN0YXRpYyBpbnQg Z3VjX3hmZXJfcnNhKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yywgc3RydWN0IGk5MTVfdm1hICp2bWEp Cj4gK3N0YXRpYyB2b2lkIGd1Y194ZmVyX3JzYShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHN0cnVj dCBpOTE1X3ZtYSAqdm1hKQo+ICAgewo+ICAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7Cj4gLQlzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdyA9 ICZndWMtPmZ3Owo+IC0Jc3RydWN0IHNnX3RhYmxlICpzZyA9IHZtYS0+cGFnZXM7Cj4gICAJdTMy IHJzYVtVT1NfUlNBX1NDUkFUQ0hfQ09VTlRdOwo+ICAgCWludCBpOwo+ICAgCj4gLQlpZiAoc2df cGNvcHlfdG9fYnVmZmVyKHNnLT5zZ2wsIHNnLT5uZW50cywgcnNhLCBzaXplb2YocnNhKSwKPiAt CQkJICAgICAgIGd1Y19mdy0+cnNhX29mZnNldCkgIT0gc2l6ZW9mKHJzYSkpCj4gLQkJcmV0dXJu IC1FSU5WQUw7Cj4gKwlzZ19wY29weV90b19idWZmZXIodm1hLT5wYWdlcy0+c2dsLCB2bWEtPnBh Z2VzLT5uZW50cywKPiArCQkJICAgcnNhLCBzaXplb2YocnNhKSwgZ3VjLT5mdy5yc2Ffb2Zmc2V0 KTsKPiAgIAo+ICAgCWZvciAoaSA9IDA7IGkgPCBVT1NfUlNBX1NDUkFUQ0hfQ09VTlQ7IGkrKykK PiAgIAkJSTkxNV9XUklURShVT1NfUlNBX1NDUkFUQ0goaSksIHJzYVtpXSk7Cj4gLQo+IC0JcmV0 dXJuIDA7Cj4gICB9Cj4gICAKPiAtLyoKPiAtICogVHJhbnNmZXIgdGhlIGZpcm13YXJlIGltYWdl IHRvIFJBTSBmb3IgZXhlY3V0aW9uIGJ5IHRoZSBtaWNyb2NvbnRyb2xsZXIuCj4gLSAqCj4gLSAq IEFyY2hpdGVjdHVyYWxseSwgdGhlIERNQSBlbmdpbmUgaXMgYmlkaXJlY3Rpb25hbCwgYW5kIGNh biBwb3RlbnRpYWxseSBldmVuCj4gLSAqIHRyYW5zZmVyIGJldHdlZW4gR1RUIGxvY2F0aW9ucy4g VGhpcyBmdW5jdGlvbmFsaXR5IGlzIGxlZnQgb3V0IG9mIHRoZSBBUEkKPiAtICogZm9yIG5vdyBh cyB0aGVyZSBpcyBubyBuZWVkIGZvciBpdC4KPiAtICovCj4gLXN0YXRpYyBpbnQgZ3VjX3hmZXJf dWNvZGUoc3RydWN0IGludGVsX2d1YyAqZ3VjLCBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKPiArc3Rh dGljIGJvb2wgZ3VjX3hmZXJfY29tcGxldGVkKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyICpz dGF0dXMpCj4gICB7Cj4gICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3Vj X3RvX2k5MTUoZ3VjKTsKPiAtCXN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3ID0gJmd1Yy0+Znc7 Cj4gLQl1bnNpZ25lZCBsb25nIG9mZnNldDsKPiAtCXUzMiBzdGF0dXM7Cj4gLQlpbnQgcmV0Owo+ IC0KPiAtCS8qCj4gLQkgKiBUaGUgaGVhZGVyIHBsdXMgdUNvZGUgd2lsbCBiZSBjb3BpZWQgdG8g V09QQ00gdmlhIERNQSwgZXhjbHVkaW5nIGFueQo+IC0JICogb3RoZXIgY29tcG9uZW50cwo+IC0J ICovCj4gLQlJOTE1X1dSSVRFKERNQV9DT1BZX1NJWkUsIGd1Y19mdy0+aGVhZGVyX3NpemUgKyBn dWNfZnctPnVjb2RlX3NpemUpOwo+IC0KPiAtCS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3MgZm9y IHRoZSBuZXcgYmxvYiAqLwo+IC0Jb2Zmc2V0ID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg dm1hKSArIGd1Y19mdy0+aGVhZGVyX29mZnNldDsKPiAtCUk5MTVfV1JJVEUoRE1BX0FERFJfMF9M T1csIGxvd2VyXzMyX2JpdHMob2Zmc2V0KSk7Cj4gLQlJOTE1X1dSSVRFKERNQV9BRERSXzBfSElH SCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKPiAgIAo+IC0JLyoKPiAtCSAqIFNl dCB0aGUgRE1BIGRlc3RpbmF0aW9uLiBDdXJyZW50IHVDb2RlIGV4cGVjdHMgdGhlIGNvZGUgdG8g YmUKPiAtCSAqIGxvYWRlZCBhdCA4azsgbG9jYXRpb25zIGJlbG93IHRoaXMgYXJlIHVzZWQgZm9y IHRoZSBzdGFjay4KPiAtCSAqLwo+IC0JSTkxNV9XUklURShETUFfQUREUl8xX0xPVywgMHgyMDAw KTsKPiAtCUk5MTVfV1JJVEUoRE1BX0FERFJfMV9ISUdILCBETUFfQUREUkVTU19TUEFDRV9XT1BD TSk7Cj4gLQo+IC0JLyogRmluYWxseSBzdGFydCB0aGUgRE1BICovCj4gLQlJOTE1X1dSSVRFKERN QV9DVFJMLCBfTUFTS0VEX0JJVF9FTkFCTEUoVU9TX01PVkUgfCBTVEFSVF9ETUEpKTsKPiAtCj4g LQkvKiBXYWl0IGZvciBETUEgdG8gZmluaXNoICovCj4gLQlyZXQgPSBfX2ludGVsX3dhaXRfZm9y X3JlZ2lzdGVyX2Z3KGRldl9wcml2LCBETUFfQ1RSTCwgU1RBUlRfRE1BLCAwLAo+IC0JCQkJCSAg IDIsIDEwMCwgJnN0YXR1cyk7Cj4gLQlEUk1fREVCVUdfRFJJVkVSKCJHdUMgRE1BIHN0YXR1cyAl I3hcbiIsIHN0YXR1cyk7Cj4gLQo+IC0JcmV0dXJuIHJldDsKPiArCS8qIERpZCB3ZSBjb21wbGV0 ZSB0aGUgeGZlcj8gKi8KPiArCSpzdGF0dXMgPSBJOTE1X1JFQUQoRE1BX0NUUkwpOwo+ICsJcmV0 dXJuICEoKnN0YXR1cyAmIFNUQVJUX0RNQSk7Cj4gICB9Cj4gICAKPiAgIC8qCj4gQEAgLTIyOCw5 ICsxODgsNTEgQEAgc3RhdGljIGludCBndWNfd2FpdF91Y29kZShzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMpCj4gICAJCXJldCA9IC1FTk9FWEVDOwo+ICAgCX0KPiAgIAo+ICsJaWYgKHJldCA9PSAwICYm ICFndWNfeGZlcl9jb21wbGV0ZWQoZ3VjLCAmc3RhdHVzKSkgewo+ICsJCURSTV9FUlJPUigiR3VD IGlzIHJlYWR5LCBidXQgdGhlIHhmZXIgJTA4eCBpcyBpbmNvbXBsZXRlXG4iLAo+ICsJCQkgIHN0 YXR1cyk7Cj4gKwkJcmV0ID0gLUVOWElPOwoKRG8gd2Ugd2FudCB0byBhbGxvdyByZXNldCAmIHJl dHJ5IGluIHRoaXMgc2NlbmFyaW8/IFRoaXMgZmVlbHMgbGlrZSAKc29tZXRoaW5nIHdlaXJkIGhh cHBlbmluZyBpbiBIVywgc28gSSdkIHNheSBpdCdkIGJlIHdvcnRoIHRvIGFsbG93IGEgcmV0cnku CgpUaGFua3MsCkRhbmllbGUKCj4gKwl9Cj4gKwo+ICAgCXJldHVybiByZXQ7Cj4gICB9Cj4gICAK PiArLyoKPiArICogVHJhbnNmZXIgdGhlIGZpcm13YXJlIGltYWdlIHRvIFJBTSBmb3IgZXhlY3V0 aW9uIGJ5IHRoZSBtaWNyb2NvbnRyb2xsZXIuCj4gKyAqCj4gKyAqIEFyY2hpdGVjdHVyYWxseSwg dGhlIERNQSBlbmdpbmUgaXMgYmlkaXJlY3Rpb25hbCwgYW5kIGNhbiBwb3RlbnRpYWxseSBldmVu Cj4gKyAqIHRyYW5zZmVyIGJldHdlZW4gR1RUIGxvY2F0aW9ucy4gVGhpcyBmdW5jdGlvbmFsaXR5 IGlzIGxlZnQgb3V0IG9mIHRoZSBBUEkKPiArICogZm9yIG5vdyBhcyB0aGVyZSBpcyBubyBuZWVk IGZvciBpdC4KPiArICovCj4gK3N0YXRpYyBpbnQgZ3VjX3hmZXJfdWNvZGUoc3RydWN0IGludGVs X2d1YyAqZ3VjLCBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKPiArewo+ICsJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKPiArCXN0cnVjdCBpbnRlbF91 Y19mdyAqZ3VjX2Z3ID0gJmd1Yy0+Znc7Cj4gKwl1bnNpZ25lZCBsb25nIG9mZnNldDsKPiArCj4g KwkvKgo+ICsJICogVGhlIGhlYWRlciBwbHVzIHVDb2RlIHdpbGwgYmUgY29waWVkIHRvIFdPUENN IHZpYSBETUEsIGV4Y2x1ZGluZyBhbnkKPiArCSAqIG90aGVyIGNvbXBvbmVudHMKPiArCSAqLwo+ ICsJSTkxNV9XUklURShETUFfQ09QWV9TSVpFLCBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3 LT51Y29kZV9zaXplKTsKPiArCj4gKwkvKiBTZXQgdGhlIHNvdXJjZSBhZGRyZXNzIGZvciB0aGUg bmV3IGJsb2IgKi8KPiArCW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkg KyBndWNfZnctPmhlYWRlcl9vZmZzZXQ7Cj4gKwlJOTE1X1dSSVRFKERNQV9BRERSXzBfTE9XLCBs b3dlcl8zMl9iaXRzKG9mZnNldCkpOwo+ICsJSTkxNV9XUklURShETUFfQUREUl8wX0hJR0gsIHVw cGVyXzMyX2JpdHMob2Zmc2V0KSAmIDB4RkZGRik7Cj4gKwo+ICsJLyoKPiArCSAqIFNldCB0aGUg RE1BIGRlc3RpbmF0aW9uLiBDdXJyZW50IHVDb2RlIGV4cGVjdHMgdGhlIGNvZGUgdG8gYmUKPiAr CSAqIGxvYWRlZCBhdCA4azsgbG9jYXRpb25zIGJlbG93IHRoaXMgYXJlIHVzZWQgZm9yIHRoZSBz dGFjay4KPiArCSAqLwo+ICsJSTkxNV9XUklURShETUFfQUREUl8xX0xPVywgMHgyMDAwKTsKPiAr CUk5MTVfV1JJVEUoRE1BX0FERFJfMV9ISUdILCBETUFfQUREUkVTU19TUEFDRV9XT1BDTSk7Cj4g Kwo+ICsJLyogRmluYWxseSBzdGFydCB0aGUgRE1BICovCj4gKwlJOTE1X1dSSVRFKERNQV9DVFJM LCBfTUFTS0VEX0JJVF9FTkFCTEUoVU9TX01PVkUgfCBTVEFSVF9ETUEpKTsKPiArCj4gKwlyZXR1 cm4gZ3VjX3dhaXRfdWNvZGUoZ3VjKTsKPiArfQo+ICAgLyoKPiAgICAqIExvYWQgdGhlIEd1QyBm aXJtd2FyZSBibG9iIGludG8gdGhlIE1pbnV0ZUlBLgo+ICAgICovCj4gQEAgLTI1MSwxNyArMjUz LDkgQEAgc3RhdGljIGludCBndWNfZndfeGZlcihzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdywg c3RydWN0IGk5MTVfdm1hICp2bWEpCj4gICAJICogYnkgdGhlIERNQSBlbmdpbmUgaW4gb25lIG9w ZXJhdGlvbiwgd2hlcmVhcyB0aGUgUlNBIHNpZ25hdHVyZSBpcwo+ICAgCSAqIGxvYWRlZCB2aWEg TU1JTy4KPiAgIAkgKi8KPiAtCXJldCA9IGd1Y194ZmVyX3JzYShndWMsIHZtYSk7Cj4gLQlpZiAo cmV0KQo+IC0JCURSTV9XQVJOKCJHdUMgZmlybXdhcmUgc2lnbmF0dXJlIHhmZXIgZXJyb3IgJWRc biIsIHJldCk7Cj4gKwlndWNfeGZlcl9yc2EoZ3VjLCB2bWEpOwo+ICAgCj4gICAJcmV0ID0gZ3Vj X3hmZXJfdWNvZGUoZ3VjLCB2bWEpOwo+IC0JaWYgKHJldCkKPiAtCQlEUk1fV0FSTigiR3VDIGZp cm13YXJlIGNvZGUgeGZlciBlcnJvciAlZFxuIiwgcmV0KTsKPiAtCj4gLQlyZXQgPSBndWNfd2Fp dF91Y29kZShndWMpOwo+IC0JaWYgKHJldCkKPiAtCQlEUk1fRVJST1IoIkd1QyBmaXJtd2FyZSB4 ZmVyIGVycm9yICVkXG4iLCByZXQpOwo+ICAgCj4gICAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9w dXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwo+ICAgCj4gCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=