From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff McGee Subject: Re: [PATCH 08/11] drm/i915/execlists: Force preemption via reset on timeout Date: Tue, 27 Mar 2018 08:50:43 -0700 Message-ID: <20180327155043.GE2879@jeffdesk> References: <20180326115044.2505-1-chris@chris-wilson.co.uk> <20180326115044.2505-9-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B3576E176 for ; Tue, 27 Mar 2018 16:05:59 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20180326115044.2505-9-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBNYXIgMjYsIDIwMTggYXQgMTI6NTA6NDFQTSArMDEwMCwgQ2hyaXMgV2lsc29uIHdy b3RlOgo+IEluc3RhbGwgYSB0aW1lciB3aGVuIHRyeWluZyB0byBwcmVlbXB0IG9uIGJlaGFsZiBv ZiBhbiBpbXBvcnRhbnQKPiBjb250ZXh0IHN1Y2ggdGhhdCBpZiB0aGUgYWN0aXZlIGNvbnRleHQg ZG9lcyBub3QgaG9ub3VyIHRoZSBwcmVlbXB0aW9uCj4gcmVxdWVzdCB3aXRoaW4gdGhlIGRlc2ly ZWQgdGltZW91dCwgdGhlbiB3ZSByZXNldCB0aGUgR1BVIHRvIGFsbG93IHRoZQo+IGltcG9ydGFu dCBjb250ZXh0IHRvIHJ1bi4KPiAKPiAoT3Blbjogc2hvdWxkIG5vdCB0aGUgdGltZXIgYmUgc3Rh cnRlZCBmcm9tIHJlY2VpdmluZyB0aGUgaGlnaCBwcmlvcml0eQo+IHJlcXVlc3QuLi4pCj4gCj4g U2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4g LS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDUzICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmggfCAgOCArKysrKwo+ICAyIGZpbGVzIGNoYW5nZWQsIDYxIGluc2VydGlv bnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwo+IGluZGV4IDUwNjg4ZmM4ODlkOS4u NmRhODE2ZDIzY2IzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBAQCAtNTMzLDYg KzUzMyw0NyBAQCBzdGF0aWMgdm9pZCBpbmplY3RfcHJlZW1wdF9jb250ZXh0KHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgCj4gIAlleGVjbGlzdHNfY2xlYXJfYWN0aXZlKGV4ZWNs aXN0cywgRVhFQ0xJU1RTX0FDVElWRV9IV0FDSyk7Cj4gIAlleGVjbGlzdHNfc2V0X2FjdGl2ZShl eGVjbGlzdHMsIEVYRUNMSVNUU19BQ1RJVkVfUFJFRU1QVCk7Cj4gKwo+ICsJLyogU2V0IGEgdGlt ZXIgdG8gZm9yY2UgcHJlZW1wdGlvbiB2cyBob3N0aWxlIHVzZXJzcGFjZSAqLwo+ICsJaWYgKGV4 ZWNsaXN0cy0+cXVldWVfcHJlZW1wdF90aW1lb3V0KSB7Cj4gKwkJR0VNX1RSQUNFKCIlcyB0aW1l b3V0PSV1bnNcbiIsCj4gKwkJCSAgZW5naW5lLT5uYW1lLCBleGVjbGlzdHMtPnF1ZXVlX3ByZWVt cHRfdGltZW91dCk7Cj4gKwkJaHJ0aW1lcl9zdGFydCgmZXhlY2xpc3RzLT5wcmVlbXB0X3RpbWVy LAo+ICsJCQkgICAgICBrdGltZV9zZXQoMCwgZXhlY2xpc3RzLT5xdWV1ZV9wcmVlbXB0X3RpbWVv dXQpLAo+ICsJCQkgICAgICBIUlRJTUVSX01PREVfUkVMKTsKPiArCX0KPiArfQo+ICsKPiArc3Rh dGljIGVudW0gaHJ0aW1lcl9yZXN0YXJ0IHByZWVtcHRfdGltZW91dChzdHJ1Y3QgaHJ0aW1lciAq aHJ0aW1lcikKPiArewo+ICsJc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0 cyA9Cj4gKwkJY29udGFpbmVyX29mKGhydGltZXIsIHR5cGVvZigqZXhlY2xpc3RzKSwgcHJlZW1w dF90aW1lcik7Cj4gKwo+ICsJR0VNX1RSQUNFKCIlc1xuIiwKPiArCQkgIGNvbnRhaW5lcl9vZihl eGVjbGlzdHMsCj4gKwkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzLAo+ICsJCQkgICAg ICAgZXhlY2xpc3RzKS0+bmFtZSk7Cj4gKwo+ICsJcXVldWVfd29yayhzeXN0ZW1faGlnaHByaV93 cSwgJmV4ZWNsaXN0cy0+cHJlZW1wdF9yZXNldCk7Cj4gKwlyZXR1cm4gSFJUSU1FUl9OT1JFU1RB UlQ7Cj4gK30KPiArCj4gK3N0YXRpYyB2b2lkIHByZWVtcHRfcmVzZXQoc3RydWN0IHdvcmtfc3Ry dWN0ICp3b3JrKQo+ICt7Cj4gKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPQo+ICsJ CWNvbnRhaW5lcl9vZih3b3JrLCB0eXBlb2YoKmVuZ2luZSksIGV4ZWNsaXN0cy5wcmVlbXB0X3Jl c2V0KTsKPiArCj4gKwlHRU1fVFJBQ0UoIiVzXG4iLCBlbmdpbmUtPm5hbWUpOwo+ICsKPiArCXRh c2tsZXRfZGlzYWJsZSgmZW5naW5lLT5leGVjbGlzdHMudGFza2xldCk7Cj4gKwo+ICsJZW5naW5l LT5leGVjbGlzdHMudGFza2xldC5mdW5jKGVuZ2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQuZGF0YSk7 ClRoaXMgc2VlbXMgcmVkdW5kYW50IHdpdGggdGhlIGV4ZWNsaXN0c19yZXNldF9wcmVwYXJlIGFs cmVhZHkgZG9pbmcgYSBwcm9jZXNzX2NzYgphdCBhIGxhdGVyIHRpbWUgdG8gZGVjaWRlIHdoZXRo ZXIgdG8gZXhlY3V0ZSBvciBhYm9ydCB0aGUgcmVzZXQuIEluIHlvdXIKcHJldmlvdXMgcHJvcG9z YWwgeW91IHN1Z2dlc3RlZCB0YXNrbGV0IGRpc2FibGUgYW5kIGtpbGwgaGVyZS4KCj4gKwo+ICsJ aWYgKGV4ZWNsaXN0c19pc19hY3RpdmUoJmVuZ2luZS0+ZXhlY2xpc3RzLCBFWEVDTElTVFNfQUNU SVZFX1BSRUVNUFQpKQo+ICsJCWk5MTVfaGFuZGxlX2Vycm9yKGVuZ2luZS0+aTkxNSwgQklUKGVu Z2luZS0+aWQpLCAwLAo+ICsJCQkJICAicHJlZW1wdGlvbiB0aW1lZCBvdXQgb24gJXMiLCBlbmdp bmUtPm5hbWUpOwo+ICsKPiArCXRhc2tsZXRfZW5hYmxlKCZlbmdpbmUtPmV4ZWNsaXN0cy50YXNr bGV0KTsKPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQgY29tcGxldGVfcHJlZW1wdF9jb250ZXh0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICpleGVjbGlzdHMpCj4gQEAgLTU0Miw2ICs1ODMs MTAgQEAgc3RhdGljIHZvaWQgY29tcGxldGVfcHJlZW1wdF9jb250ZXh0KHN0cnVjdCBpbnRlbF9l bmdpbmVfZXhlY2xpc3RzICpleGVjbGlzdHMpCj4gIAlleGVjbGlzdHNfY2FuY2VsX3BvcnRfcmVx dWVzdHMoZXhlY2xpc3RzKTsKPiAgCWV4ZWNsaXN0c191bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0 cyhleGVjbGlzdHMpOwo+ICAKPiArCS8qIElmIHRoZSB0aW1lciBhbHJlYWR5IGZpcmVkLCBjb21w bGV0ZSB0aGUgcmVzZXQgKi8KPiArCWlmIChocnRpbWVyX3RyeV90b19jYW5jZWwoJmV4ZWNsaXN0 cy0+cHJlZW1wdF90aW1lcikgPCAwKQo+ICsJCXJldHVybjsKPiArCj4gIAlleGVjbGlzdHNfY2xl YXJfYWN0aXZlKGV4ZWNsaXN0cywgRVhFQ0xJU1RTX0FDVElWRV9QUkVFTVBUKTsKPiAgfQo+ICAK PiBAQCAtNzA4LDYgKzc1Myw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgCQkJa21lbV9jYWNoZV9mcmVlKGVuZ2luZS0+ aTkxNS0+cHJpb3JpdGllcywgcCk7Cj4gIAl9Cj4gIGRvbmU6Cj4gKwlleGVjbGlzdHMtPnF1ZXVl X3ByZWVtcHRfdGltZW91dCA9IDA7IC8qIHByZWVtcHRpb24gcG9pbnQgcGFzc2VkICovCj4gIAll eGVjbGlzdHMtPnF1ZXVlX3ByaW9yaXR5ID0gcmIgPyB0b19wcmlvbGlzdChyYiktPnByaW9yaXR5 IDogSU5UX01JTjsKPiAgCWV4ZWNsaXN0cy0+Zmlyc3QgPSByYjsKPiAgCWlmIChzdWJtaXQpCj4g QEAgLTg2NCw2ICs5MTAsNyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3Rz KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgCj4gIAkvKiBSZW1haW5pbmcgX3Vu cmVhZHlfIHJlcXVlc3RzIHdpbGwgYmUgbm9wJ2VkIHdoZW4gc3VibWl0dGVkICovCj4gIAo+ICsJ ZXhlY2xpc3RzLT5xdWV1ZV9wcmVlbXB0X3RpbWVvdXQgPSAwOwo+ICAJZXhlY2xpc3RzLT5xdWV1 ZV9wcmlvcml0eSA9IElOVF9NSU47Cj4gIAlleGVjbGlzdHMtPnF1ZXVlID0gUkJfUk9PVDsKPiAg CWV4ZWNsaXN0cy0+Zmlyc3QgPSBOVUxMOwo+IEBAIC0xMDgwLDYgKzExMjcsNyBAQCBzdGF0aWMg dm9pZCBxdWV1ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKPiAgc3Rh dGljIHZvaWQgX19zdWJtaXRfcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBp bnQgcHJpbykKPiAgewo+ICAJCWVuZ2luZS0+ZXhlY2xpc3RzLnF1ZXVlX3ByaW9yaXR5ID0gcHJp bzsKPiArCQllbmdpbmUtPmV4ZWNsaXN0cy5xdWV1ZV9wcmVlbXB0X3RpbWVvdXQgPSAwOwo+ICAJ CXRhc2tsZXRfaGlfc2NoZWR1bGUoJmVuZ2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQpOwo+ICB9Cj4g IAo+IEBAIC0yMjcwLDYgKzIzMTgsMTEgQEAgbG9naWNhbF9yaW5nX3NldHVwKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgCXRhc2tsZXRfaW5pdCgmZW5naW5lLT5leGVjbGlzdHMu dGFza2xldCwKPiAgCQkgICAgIGV4ZWNsaXN0c19zdWJtaXNzaW9uX3Rhc2tsZXQsICh1bnNpZ25l ZCBsb25nKWVuZ2luZSk7Cj4gIAo+ICsJSU5JVF9XT1JLKCZlbmdpbmUtPmV4ZWNsaXN0cy5wcmVl bXB0X3Jlc2V0LCBwcmVlbXB0X3Jlc2V0KTsKPiArCWhydGltZXJfaW5pdCgmZW5naW5lLT5leGVj bGlzdHMucHJlZW1wdF90aW1lciwKPiArCQkgICAgIENMT0NLX01PTk9UT05JQywgSFJUSU1FUl9N T0RFX1JFTCk7Cj4gKwllbmdpbmUtPmV4ZWNsaXN0cy5wcmVlbXB0X3RpbWVyLmZ1bmN0aW9uID0g cHJlZW1wdF90aW1lb3V0Owo+ICsKPiAgCWxvZ2ljYWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhlbmdp bmUpOwo+ICAJbG9naWNhbF9yaW5nX2RlZmF1bHRfaXJxcyhlbmdpbmUpOwo+ICB9Cj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAo+IGluZGV4IDRjNzFkY2RjNzIyYi4uNzE2 NmY0N2M4NDg5IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAo+ IEBAIC0yODQsNiArMjg0LDExIEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzIHsKPiAg CSAqLwo+ICAJaW50IHF1ZXVlX3ByaW9yaXR5Owo+ICAKPiArCS8qKgo+ICsJICogQHF1ZXVlX3By ZWVtcHRfdGltZW91dDogVGltZW91dCBpbiBucyBiZWZvcmUgZm9yY2luZyBwcmVlbXB0aW9uLgo+ ICsJICovCj4gKwl1bnNpZ25lZCBpbnQgcXVldWVfcHJlZW1wdF90aW1lb3V0Owo+ICsKPiAgCS8q Kgo+ICAJICogQHF1ZXVlOiBxdWV1ZSBvZiByZXF1ZXN0cywgaW4gcHJpb3JpdHkgbGlzdHMKPiAg CSAqLwo+IEBAIC0zMTMsNiArMzE4LDkgQEAgc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMg ewo+ICAJICogQHByZWVtcHRfY29tcGxldGVfc3RhdHVzOiBleHBlY3RlZCBDU0IgdXBvbiBjb21w bGV0aW5nIHByZWVtcHRpb24KPiAgCSAqLwo+ICAJdTMyIHByZWVtcHRfY29tcGxldGVfc3RhdHVz Owo+ICsKPiArCXN0cnVjdCBocnRpbWVyIHByZWVtcHRfdGltZXI7Cj4gKwlzdHJ1Y3Qgd29ya19z dHJ1Y3QgcHJlZW1wdF9yZXNldDsKPiAgfTsKPiAgCj4gICNkZWZpbmUgSU5URUxfRU5HSU5FX0NT X01BWF9OQU1FIDgKPiAtLSAKPiAyLjE2LjMKPiAKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==