From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carlos Santa <carlos.santa@intel.com>
Subject: drm/i915/watchdog: move emit_stop_watchdog until the
 very end of the ring commands
Date: Fri,  4 Jan 2019 18:40:00 -0800
Message-ID: <20190105024001.37629-8-carlos.santa@intel.com>
References: <20190105024001.37629-1-carlos.santa@intel.com>
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 mga17.intel.com (mga17.intel.com [192.55.52.151])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 6DF4D6E642
 for <intel-gfx@lists.freedesktop.org>; Sat,  5 Jan 2019 02:40:12 +0000 (UTC)
In-Reply-To: <20190105024001.37629-1-carlos.santa@intel.com>
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
Cc: Michel Thierry <michel.thierry@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KCk9uIGNvbW1h
bmQgc3RyZWFtcyB0aGF0IGNvdWxkIHBvdGVudGlhbGx5IGhhbmcgdGhlIEdQVSBhZnRlciBhIGxh
c3QKZmx1c2ggY29tbWFuZCwgaXQncyBiZXN0IG5vdCB0byBjYW5jZWwgdGhlIHdhdGNoZG9nCnVu
dGlsIGFmdGVyIGFsbCBjb21tYW5kcyBoYXZlIGV4ZWN1dGVkLgoKUGF0Y2ggc2hhcmVkIGJ5IE1p
Y2hlbCBUaGllcnJ5IHRocm91Z2ggSUlSQyBhZnRlciByZXByb2R1Y3Rpb24gb24KbXkgbG9jYWwg
c2V0dXAuCgpUZXN0ZWQtYnk6IENhcmxvcyBTYW50YSA8Y2FybG9zLnNhbnRhQGludGVsLmNvbT4K
Q0M6IEFudG9uaW8gQXJnZW56aWFubyA8YW50b25pby5hcmdlbnppYW5vQGludGVsLmNvbT4KQ2M6
IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1v
ZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ClNpZ25lZC1v
ZmYtYnk6IENhcmxvcyBTYW50YSA8Y2FybG9zLnNhbnRhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyB8IDUzICsrKysrKysrKysrKysrKysrKysrKysrKysr
Ky0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkK
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDBhZmNiZWIxODMyOS4uMjViYTVmY2M5NDY2
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTg4NSw4ICsxODg1LDggQEAgc3RhdGlj
IGludCBnZW44X2VtaXRfYmJfc3RhcnQoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsCiAJCUdFTV9C
VUdfT04oIWVuZ2luZS0+ZW1pdF9zdGFydF93YXRjaGRvZyB8fAogCQkJICAgIWVuZ2luZS0+ZW1p
dF9zdG9wX3dhdGNoZG9nKTsKIAotCQkvKiArIHN0YXJ0X3dhdGNoZG9nICg2KSArIHN0b3Bfd2F0
Y2hkb2cgKDQpICovCi0JCW51bV9kd29yZHMgKz0gMTA7CisJCS8qICsgc3RhcnRfd2F0Y2hkb2cg
KDYpICovCisJCW51bV9kd29yZHMgKz0gNjsKIAkJd2F0Y2hkb2dfcnVubmluZyA9IHRydWU7CiAg
ICAgICAgIH0KIApAQCAtMTkyNywxMCArMTkyNyw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2Ji
X3N0YXJ0KHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAogCSpjcysrID0gTUlfQVJCX09OX09GRiB8
IE1JX0FSQl9ESVNBQkxFOwogCSpjcysrID0gTUlfTk9PUDsKIAotCWlmICh3YXRjaGRvZ19ydW5u
aW5nKSB7Ci0JCS8qIENhbmNlbCB3YXRjaGRvZyB0aW1lciAqLwotCQljcyA9IGVuZ2luZS0+ZW1p
dF9zdG9wX3dhdGNoZG9nKHJxLCBjcyk7Ci0JfQorCS8vIFhYWDogZW1pdF9zdG9wX3dhdGNoZG9n
IGhhcHBlbnMgaW4gZ2VuOF9lbWl0X2JyZWFkY3J1bWJfdmNzCiAKIAlpbnRlbF9yaW5nX2FkdmFu
Y2UocnEsIGNzKTsKIAlyZXR1cm4gMDsKQEAgLTIxODksNiArMjE4NiwzNyBAQCBzdGF0aWMgdm9p
ZCBnZW44X2VtaXRfYnJlYWRjcnVtYihzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0LCB1MzIg
KmNzKQogfQogc3RhdGljIGNvbnN0IGludCBnZW44X2VtaXRfYnJlYWRjcnVtYl9zeiA9IDYgKyBX
QV9UQUlMX0RXT1JEUzsKIAorc3RhdGljIHZvaWQgZ2VuOF9lbWl0X2JyZWFkY3J1bWJfdmNzKHN0
cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QsIHUzMiAqY3MpCit7CisJLyogdy9hOiBiaXQgNSBu
ZWVkcyB0byBiZSB6ZXJvIGZvciBNSV9GTFVTSF9EVyBhZGRyZXNzLiAqLworCUJVSUxEX0JVR19P
TihJOTE1X0dFTV9IV1NfSU5ERVhfQUREUiAmICgxIDw8IDUpKTsKKworCWNzID0gZ2VuOF9lbWl0
X2dndHRfd3JpdGUoY3MsIHJlcXVlc3QtPmdsb2JhbF9zZXFubywKKwkJCQkgIGludGVsX2h3c19z
ZXFub19hZGRyZXNzKHJlcXVlc3QtPmVuZ2luZSkpOworCSpjcysrID0gTUlfVVNFUl9JTlRFUlJV
UFQ7CisJKmNzKysgPSBNSV9BUkJfT05fT0ZGIHwgTUlfQVJCX0VOQUJMRTsKKworCS8vIHN0b3Bf
d2F0Y2hkb2cgYXQgdGhlIHZlcnkgZW5kIG9mIHRoZSByaW5nIGNvbW1hbmRzCisJaWYgKHJlcXVl
c3QtPmdlbV9jb250ZXh0LT5fX2VuZ2luZVtWQ1NdLndhdGNoZG9nX3RocmVzaG9sZCAhPSAwKQor
CXsKKwkJLyogQ2FuY2VsIHdhdGNoZG9nIHRpbWVyICovCisJCUdFTV9CVUdfT04oIXJlcXVlc3Qt
PmVuZ2luZS0+ZW1pdF9zdG9wX3dhdGNoZG9nKTsKKwkJY3MgPSByZXF1ZXN0LT5lbmdpbmUtPmVt
aXRfc3RvcF93YXRjaGRvZyhyZXF1ZXN0LCBjcyk7CisJfQorCWVsc2UKKwl7CisJCSpjcysrID0g
TUlfTk9PUDsKKwkJKmNzKysgPSBNSV9OT09QOworCQkqY3MrKyA9IE1JX05PT1A7CisJCSpjcysr
ID0gTUlfTk9PUDsKKwl9CisKKwlyZXF1ZXN0LT50YWlsID0gaW50ZWxfcmluZ19vZmZzZXQocmVx
dWVzdCwgY3MpOworCWFzc2VydF9yaW5nX3RhaWxfdmFsaWQocmVxdWVzdC0+cmluZywgcmVxdWVz
dC0+dGFpbCk7CisJZ2VuOF9lbWl0X3dhX3RhaWwocmVxdWVzdCwgY3MpOworfQorc3RhdGljIGNv
bnN0IGludCBnZW44X2VtaXRfYnJlYWRjcnVtYl92Y3Nfc3ogPSA2ICsgV0FfVEFJTF9EV09SRFMg
KyA0OyAvLys0IGZvciBvcHRpb25hbCBzdG9wX3dhdGNoZG9nCisKIHN0YXRpYyB2b2lkIGdlbjhf
ZW1pdF9icmVhZGNydW1iX3JjcyhzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0LCB1MzIgKmNz
KQogewogCS8qIFdlJ3JlIHVzaW5nIHF3b3JkIHdyaXRlLCBzZXFubyBzaG91bGQgYmUgYWxpZ25l
ZCB0byA4IGJ5dGVzLiAqLwpAQCAtMjMwNiw4ICsyMzM0LDE3IEBAIGxvZ2ljYWxfcmluZ19kZWZh
dWx0X3ZmdW5jcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZW5naW5lLT5yZXF1
ZXN0X2FsbG9jID0gZXhlY2xpc3RzX3JlcXVlc3RfYWxsb2M7CiAKIAllbmdpbmUtPmVtaXRfZmx1
c2ggPSBnZW44X2VtaXRfZmx1c2g7Ci0JZW5naW5lLT5lbWl0X2JyZWFkY3J1bWIgPSBnZW44X2Vt
aXRfYnJlYWRjcnVtYjsKLQllbmdpbmUtPmVtaXRfYnJlYWRjcnVtYl9zeiA9IGdlbjhfZW1pdF9i
cmVhZGNydW1iX3N6OworCisJaWYgKGVuZ2luZS0+aWQgPT0gVkNTIHx8IGVuZ2luZS0+aWQgPT0g
VkNTMikKKwl7CisJCWVuZ2luZS0+ZW1pdF9icmVhZGNydW1iID0gZ2VuOF9lbWl0X2JyZWFkY3J1
bWJfdmNzOworCQllbmdpbmUtPmVtaXRfYnJlYWRjcnVtYl9zeiA9IGdlbjhfZW1pdF9icmVhZGNy
dW1iX3Zjc19zejsKKwl9CisJZWxzZQorCXsKKwkJZW5naW5lLT5lbWl0X2JyZWFkY3J1bWIgPSBn
ZW44X2VtaXRfYnJlYWRjcnVtYjsKKwkJZW5naW5lLT5lbWl0X2JyZWFkY3J1bWJfc3ogPSBnZW44
X2VtaXRfYnJlYWRjcnVtYl9zejsKKwl9CiAKIAllbmdpbmUtPnNldF9kZWZhdWx0X3N1Ym1pc3Np
b24gPSBpbnRlbF9leGVjbGlzdHNfc2V0X2RlZmF1bHRfc3VibWlzc2lvbjsKIAotLSAKMi4xNy4x
CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n
ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK