From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: drm/i915/watchdog: move emit_stop_watchdog until the very end of the ring commands Date: Mon, 7 Jan 2019 12:50:24 +0000 Message-ID: References: <20190105024001.37629-1-carlos.santa@intel.com> <20190105024001.37629-8-carlos.santa@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 102426E4D0 for ; Mon, 7 Jan 2019 12:50:28 +0000 (UTC) In-Reply-To: <20190105024001.37629-8-carlos.santa@intel.com> 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: Carlos Santa , intel-gfx@lists.freedesktop.org Cc: Michel Thierry List-Id: intel-gfx@lists.freedesktop.org Ck9uIDA1LzAxLzIwMTkgMDI6NDAsIENhcmxvcyBTYW50YSB3cm90ZToKPiBGcm9tOiBNaWNoZWwg VGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgo+IAo+IE9uIGNvbW1hbmQgc3RyZWFt cyB0aGF0IGNvdWxkIHBvdGVudGlhbGx5IGhhbmcgdGhlIEdQVSBhZnRlciBhIGxhc3QKPiBmbHVz aCBjb21tYW5kLCBpdCdzIGJlc3Qgbm90IHRvIGNhbmNlbCB0aGUgd2F0Y2hkb2cKPiB1bnRpbCBh ZnRlciBhbGwgY29tbWFuZHMgaGF2ZSBleGVjdXRlZC4KPiAKPiBQYXRjaCBzaGFyZWQgYnkgTWlj aGVsIFRoaWVycnkgdGhyb3VnaCBJSVJDIGFmdGVyIHJlcHJvZHVjdGlvbiBvbgoKSm9vbmFzIHBv aW50ZWQgb3V0IG9uIElSQyB0aGF0IElSQyBpcyBjYWxsZWQgSVJDLiA6KQoKPiBteSBsb2NhbCBz ZXR1cC4KPiAKPiBUZXN0ZWQtYnk6IENhcmxvcyBTYW50YSA8Y2FybG9zLnNhbnRhQGludGVsLmNv bT4KPiBDQzogQW50b25pbyBBcmdlbnppYW5vIDxhbnRvbmlvLmFyZ2Vuemlhbm9AaW50ZWwuY29t Pgo+IENjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AbGludXguaW50ZWwuY29tPgo+ IFNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ Cj4gU2lnbmVkLW9mZi1ieTogQ2FybG9zIFNhbnRhIDxjYXJsb3Muc2FudGFAaW50ZWwuY29tPgo+ IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgfCA1MyArKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMo KyksIDggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKPiBpbmRleCAw YWZjYmViMTgzMjkuLjI1YmE1ZmNjOTQ2NiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j Cj4gQEAgLTE4ODUsOCArMTg4NSw4IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2JiX3N0YXJ0KHN0 cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAo+ICAgCQlHRU1fQlVHX09OKCFlbmdpbmUtPmVtaXRfc3Rh cnRfd2F0Y2hkb2cgfHwKPiAgIAkJCSAgICFlbmdpbmUtPmVtaXRfc3RvcF93YXRjaGRvZyk7Cj4g ICAKPiAtCQkvKiArIHN0YXJ0X3dhdGNoZG9nICg2KSArIHN0b3Bfd2F0Y2hkb2cgKDQpICovCj4g LQkJbnVtX2R3b3JkcyArPSAxMDsKPiArCQkvKiArIHN0YXJ0X3dhdGNoZG9nICg2KSAqLwo+ICsJ CW51bV9kd29yZHMgKz0gNjsKPiAgIAkJd2F0Y2hkb2dfcnVubmluZyA9IHRydWU7Cj4gICAgICAg ICAgIH0KPiAgIAo+IEBAIC0xOTI3LDEwICsxOTI3LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRf YmJfc3RhcnQoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsCj4gICAJKmNzKysgPSBNSV9BUkJfT05f T0ZGIHwgTUlfQVJCX0RJU0FCTEU7Cj4gICAJKmNzKysgPSBNSV9OT09QOwo+ICAgCj4gLQlpZiAo d2F0Y2hkb2dfcnVubmluZykgewo+IC0JCS8qIENhbmNlbCB3YXRjaGRvZyB0aW1lciAqLwo+IC0J CWNzID0gZW5naW5lLT5lbWl0X3N0b3Bfd2F0Y2hkb2cocnEsIGNzKTsKPiAtCX0KPiArCS8vIFhY WDogZW1pdF9zdG9wX3dhdGNoZG9nIGhhcHBlbnMgaW4gZ2VuOF9lbWl0X2JyZWFkY3J1bWJfdmNz CgpObyBDKysgY29tbWVudHMgcGxlYXNlLiBBbmQgd2hhdCBkb2VzIFhYWCBtZWFuPyBEb2Vzbid0 IGZlZWwgbGlrZSBpdCAKYmVsb25ncy4KCj4gICAKPiAgIAlpbnRlbF9yaW5nX2FkdmFuY2UocnEs IGNzKTsKPiAgIAlyZXR1cm4gMDsKPiBAQCAtMjE4OSw2ICsyMTg2LDM3IEBAIHN0YXRpYyB2b2lk IGdlbjhfZW1pdF9icmVhZGNydW1iKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QsIHUzMiAq Y3MpCj4gICB9Cj4gICBzdGF0aWMgY29uc3QgaW50IGdlbjhfZW1pdF9icmVhZGNydW1iX3N6ID0g NiArIFdBX1RBSUxfRFdPUkRTOwo+ICAgCj4gK3N0YXRpYyB2b2lkIGdlbjhfZW1pdF9icmVhZGNy dW1iX3ZjcyhzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0LCB1MzIgKmNzKQo+ICt7Cj4gKwkv KiB3L2E6IGJpdCA1IG5lZWRzIHRvIGJlIHplcm8gZm9yIE1JX0ZMVVNIX0RXIGFkZHJlc3MuICov Cj4gKwlCVUlMRF9CVUdfT04oSTkxNV9HRU1fSFdTX0lOREVYX0FERFIgJiAoMSA8PCA1KSk7Cj4g Kwo+ICsJY3MgPSBnZW44X2VtaXRfZ2d0dF93cml0ZShjcywgcmVxdWVzdC0+Z2xvYmFsX3NlcW5v LAo+ICsJCQkJICBpbnRlbF9od3Nfc2Vxbm9fYWRkcmVzcyhyZXF1ZXN0LT5lbmdpbmUpKTsKPiAr CSpjcysrID0gTUlfVVNFUl9JTlRFUlJVUFQ7Cj4gKwkqY3MrKyA9IE1JX0FSQl9PTl9PRkYgfCBN SV9BUkJfRU5BQkxFOwo+ICsKPiArCS8vIHN0b3Bfd2F0Y2hkb2cgYXQgdGhlIHZlcnkgZW5kIG9m IHRoZSByaW5nIGNvbW1hbmRzCj4gKwlpZiAocmVxdWVzdC0+Z2VtX2NvbnRleHQtPl9fZW5naW5l W1ZDU10ud2F0Y2hkb2dfdGhyZXNob2xkICE9IDApCgpWQ1MgaXMgd3JvbmcuIFdob2xlIGNoZWNr IG5lZWRzIHRvIGJlIHRvX2ludGVsX2NvbnRleHQoY3R4LCAKZW5naW5lKS0+d2F0Y2hkb2dfdGhy ZXNob2xkIEkgdGhpbmsuCgo+ICsJewo+ICsJCS8qIENhbmNlbCB3YXRjaGRvZyB0aW1lciAqLwo+ ICsJCUdFTV9CVUdfT04oIXJlcXVlc3QtPmVuZ2luZS0+ZW1pdF9zdG9wX3dhdGNoZG9nKTsKPiAr CQljcyA9IHJlcXVlc3QtPmVuZ2luZS0+ZW1pdF9zdG9wX3dhdGNoZG9nKHJlcXVlc3QsIGNzKTsK PiArCX0KPiArCWVsc2UKPiArCXsKCkNvZGluZyBzdHlsZSBpcyB3cm9uZyAoY3VybHkgYnJhY2Vz IGZvciBpZiBlbHNlKS4KCj4gKwkJKmNzKysgPSBNSV9OT09QOwo+ICsJCSpjcysrID0gTUlfTk9P UDsKPiArCQkqY3MrKyA9IE1JX05PT1A7Cj4gKwkJKmNzKysgPSBNSV9OT09QOwo+ICsJfQo+ICsK PiArCXJlcXVlc3QtPnRhaWwgPSBpbnRlbF9yaW5nX29mZnNldChyZXF1ZXN0LCBjcyk7Cj4gKwlh c3NlcnRfcmluZ190YWlsX3ZhbGlkKHJlcXVlc3QtPnJpbmcsIHJlcXVlc3QtPnRhaWwpOwo+ICsJ Z2VuOF9lbWl0X3dhX3RhaWwocmVxdWVzdCwgY3MpOwo+ICt9Cj4gK3N0YXRpYyBjb25zdCBpbnQg Z2VuOF9lbWl0X2JyZWFkY3J1bWJfdmNzX3N6ID0gNiArIFdBX1RBSUxfRFdPUkRTICsgNDsgLy8r NCBmb3Igb3B0aW9uYWwgc3RvcF93YXRjaGRvZwo+ICsKPiAgIHN0YXRpYyB2b2lkIGdlbjhfZW1p dF9icmVhZGNydW1iX3JjcyhzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0LCB1MzIgKmNzKQo+ ICAgewo+ICAgCS8qIFdlJ3JlIHVzaW5nIHF3b3JkIHdyaXRlLCBzZXFubyBzaG91bGQgYmUgYWxp Z25lZCB0byA4IGJ5dGVzLiAqLwo+IEBAIC0yMzA2LDggKzIzMzQsMTcgQEAgbG9naWNhbF9yaW5n X2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgIAllbmdp bmUtPnJlcXVlc3RfYWxsb2MgPSBleGVjbGlzdHNfcmVxdWVzdF9hbGxvYzsKPiAgIAo+ICAgCWVu Z2luZS0+ZW1pdF9mbHVzaCA9IGdlbjhfZW1pdF9mbHVzaDsKPiAtCWVuZ2luZS0+ZW1pdF9icmVh ZGNydW1iID0gZ2VuOF9lbWl0X2JyZWFkY3J1bWI7Cj4gLQllbmdpbmUtPmVtaXRfYnJlYWRjcnVt Yl9zeiA9IGdlbjhfZW1pdF9icmVhZGNydW1iX3N6Owo+ICsKPiArCWlmIChlbmdpbmUtPmlkID09 IFZDUyB8fCBlbmdpbmUtPmlkID09IFZDUzIpCgpXaGF0IGFib3V0IFZDUzMgb3IgND8gSGludCB1 c2UgZW5naW5lIGNsYXNzLgoKQW5kIHdoYXQgYWJvdXQgUkNTIGFuZCBWRUNTPwoKPiArCXsKPiAr CQllbmdpbmUtPmVtaXRfYnJlYWRjcnVtYiA9IGdlbjhfZW1pdF9icmVhZGNydW1iX3ZjczsKPiAr CQllbmdpbmUtPmVtaXRfYnJlYWRjcnVtYl9zeiA9IGdlbjhfZW1pdF9icmVhZGNydW1iX3Zjc19z ejsKPiArCX0KPiArCWVsc2UKPiArCXsKPiArCQllbmdpbmUtPmVtaXRfYnJlYWRjcnVtYiA9IGdl bjhfZW1pdF9icmVhZGNydW1iOwo+ICsJCWVuZ2luZS0+ZW1pdF9icmVhZGNydW1iX3N6ID0gZ2Vu OF9lbWl0X2JyZWFkY3J1bWJfc3o7Cj4gKwl9Cj4gICAKPiAgIAllbmdpbmUtPnNldF9kZWZhdWx0 X3N1Ym1pc3Npb24gPSBpbnRlbF9leGVjbGlzdHNfc2V0X2RlZmF1bHRfc3VibWlzc2lvbjsKPiAg IAo+IAoKTG9va3MgbGlrZSB0aGUgcGF0Y2ggc2hvdWxkIGJlIHNxdWFzaGVkIHdpdGggdGhlIG9u ZSB3aGljaCBpbXBsZW1lbnRzIAp3YXRjaGRvZyBlbWl0IHN0YXJ0L2VuZD8gSSBtZWFuIGlmIHRo ZSB3aG9sZSBzZXR1cCBoYXMgYnJva2VuIGVkZ2UgY2FzZXMgCndpdGhvdXQgdGhpcy4uCgpSZWdh cmRzLAoKVHZydGtvCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=