From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [PATCH 19/20] drm/i915: drm/i915 changes to simulated hangs Date: Fri, 23 Oct 2015 02:32:41 +0100 Message-ID: <1445563962-20753-20-git-send-email-tomas.elf@intel.com> References: <1445563962-20753-1-git-send-email-tomas.elf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 18CE76E878 for ; Thu, 22 Oct 2015 18:33:59 -0700 (PDT) In-Reply-To: <1445563962-20753-1-git-send-email-tomas.elf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel-GFX@Lists.FreeDesktop.Org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVGltIEdvcmUgPHRpbS5nb3JlQGludGVsLmNvbT4KClNpbXVsYXRlZCBoYW5ncywgYXMg dXNlZCBieSBkcnZfaGFuZ21hbiBhbmQgc29tZSBvdGhlciBJR1QgdGVzdHMsIGFyZSBub3QKaGFu ZGxlZCBjb3JyZWN0bHkgd2l0aCB0aGUgbmV3IHBlci1lbmdpbmUgaGFuZyByZWNvdmVyeSBtb2Rl LiBUaGlzIHBhdGNoIGZpeGVzCnNldmVyYWwgaXNzdWVzIG5lZWRlZCB0byBnZXQgdGhlbSB3b3Jr aW5nIGluIHRoZSBleGVjbGlzdCBjYXNlLgoKMSkgVGhlICJzaW11bGF0ZWQiIGhhbmcgaXMgZWZm ZWN0ZWQgYnkgbm90IHN1Ym1pdHRpbmcgYSBwYXJ0aWN1bGFyIGJhdGNoIGJ1ZmZlcgogICB0byB0 aGUgaGFyZHdhcmUuIEluIHRoaXMgd2F5IGl0IGlzIG5vdCBoYW5kbGVkIGJ5IHRoZSBoYXJkd2Fy ZSBhcmUgaGVuY2UKICAgcmVtYWlucyBpbiB0aGUgc29mdHdhcmUgcXVldWUsIGxlYWRpbmcgdGhl IFREUiBtZWNoYW5pc20gdG8gZGVjbGFyZSBhIGhhbmcuCiAgIFRoZSBwbGFjZSB3aGVyZSB0aGUg c3VibWlzc2lvbiBvZiB0aGUgYmF0Y2ggd2FzIGJlaW5nIGJsb2NrZWQgd2FzIGluCiAgIGludGVs X2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQuIEJlY2F1c2UgdGhpcyBtZWFucyB0aGUg cmVxdWVzdCBuZXZlcgogICBlbnRlcnMgdGhlIGV4ZWNsaXN0X3F1ZXVlLCB0aGUgVERSIG1lY2hh bmlzbSBkb2VzIG5vdCBkZXRlY3QgYSBoYW5nIGFuZCB0aGUKICAgc2l0dWF0aW9uIGlzIG5ldmVy IGNsZWFyZWQuIEFsc28sIGJsb2NraW5nIHRoZSBiYXRjaCBidWZmZXIgaGVyZSBpcyBiZWZvcmUK ICAgdGhlIGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCBvYmplY3QgZ2V0cyBhbGxvY2F0ZWQuIER1 cmluZyBURFIgd2UgbmVlZCB0bwogICBhY3R1YWxseSBjb21wbGV0ZSB0aGUgc3VibWlzc2lvbiBw cm9jZXNzIHRvIHVuaGFuZyB0aGUgcmluZywgYnV0IHdlIGFyZSBub3QKICAgaW4gdXNlciBjb250 ZXh0IHNvIGNhbm5vdCBhbGxvY2F0ZSB0aGUgcmVxdWVzdCBvYmplY3QuICBUbyBvdmVyY29tZSBi b3RoCiAgIHRoZXNlIGlzc3VlcyBJIG1vdmVkIHRoZSBwbGFjZSB3aGVyZSBzdWJtaXNzaW9uIGlz IGJsb2NrZWQgdG8KICAgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZS4gVGhpcyBtZWFucyB0aGF0 IHRoZSByZXF1ZXN0IGVudGVycyB0aGUKICAgcmluZy0+ZXhlY2xpc3RfcXVldWUsIHNvIHRoZSBU RFIgbWVjaGFuaXNtIGRldGVjdHMgdGhlIGhhbmcgYW5kIGNhbiByZXN1Ym1pdAogICB0aGUgcmVx dWVzdCBhZnRlciB0aGUgc3RvcF9yaW5ncyBiaXQgaXMgY2xlYXJlZC4KCjIpIEEgZnVydGhlciBw cm9ibGVtIGFyaXNlcyBmcm9tIGEgd29ya2Fyb3VuZCBpbiBpOTE1X2hhbmdjaGVja19zYW1wbGUg dG8gZGVhbAogICB3aXRoIGEgY29udGV4dCBzdWJtaXNzaW9uIHN0YXR1cyBvZiAiLi4uSU5DT05T SVNURU5UIiBiZWluZyByZXBvcnRlZCBieQogICBpbnRlbF9leGVjbGlzdHNfVERSX2dldF9jdXJy ZW50X3JlcXVlc3QoKSB3aGVuIHRoZSBoYXJkd2FyZSBpcyBpZGxlLiAgQQogICBzaW11bGF0ZWQg aGFuZywgYmVjYXVzZSBpdCBjYXVzZXMgdGhlIHN3IGFuZCBodyBjb250ZXh0IGlkJ3MgdG8gYmUg b3V0IG9mCiAgIHN5bmMsIHJlc3VsdHMgaW4gYSBjb250ZXh0IHN1Ym1pc3Npb24gc3RhdHVzIG9m ICIuLi5JTkNPTlNJU1RFTlQiIGJlaW5nCiAgIHJlcG9ydGVkLCB0cmlnZ2VyaW5nIHRoaXMgd29y a2Fyb3VuZCB3aGljaCByZXN1Ym1pdHMgdGhlIGJhdGNoIGFuZCBjbGVhcnMKICAgdGhlIGhhbmcs IGF2b2lkaW5nIGEgcmluZyByZXNldC4gQnV0IHdlIHdhbnQgdGhlIHJpbmcgcmVzZXQgdG8gb2Nj dXIsIHNpbmNlCiAgIHRoaXMgaXMgcGFydCBvZiB3aGF0IHdlIGFyZSB0ZXN0aW5nLiBTbywgSSBo YXZlIG1hZGUKICAgaW50ZWxfZXhlY2xpc3RzX1REUl9nZXRfY3VycmVudF9yZXF1ZXN0KCkgYXdh cmUgb2Ygc2ltdWxhdGVkIGhhbmdzLCBzbyB0aGF0CiAgIGl0IHJldHVybnMgYSBzdGF0dXMgb2Yg T0sgaW4gdGhpcyBjYXNlLiAgVGhpcyBhdm9pZHMgdGhlIHdvcmthcm91bmQgYmVpbmcKICAgdHJp Z2dlcmVkLCBsZWFkaW5nIHRvIHRoZSBURFIgbWVjaGFuaXNtIGRlY2xhcmluZyBhIHJpbmcgaGFu ZyBhbmQgZG9pbmcgYQogICByaW5nIHJlc2V0LgoKSXNzdWU6IFZJWi01NDg4ClNpZ25lZC1vZmYt Ynk6IFRpbSBHb3JlIDx0aW0uZ29yZUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFRvbWFzIEVs ZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jICB8IDEwICsrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIHwg MjYgKysrKysrKysrKysrKysrKysrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0 aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBkNDgy MzQxLi5lY2IzZWIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTExNzUsNiArMTE3NSwx NiBAQCBpbnQgaTkxNV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogCQkgfQogCX0KIAorCS8qIENsZWFyIGFueSBzaW11bGF0ZWQgaGFuZyBmbGFncyAqLworCWlm IChkZXZfcHJpdi0+Z3B1X2Vycm9yLnN0b3BfcmluZ3MpIHsKKwkJRFJNX0lORk8oIlNpbXVsYXRl ZCBncHUgaGFuZywgcmVzZXQgc3RvcF9yaW5ncyBiaXRzICUwOHhcbiIsCisJCQkoMHgxIDw8IGVu Z2luZS0+aWQpKTsKKwkJZGV2X3ByaXYtPmdwdV9lcnJvci5zdG9wX3JpbmdzICY9IH4oMHgxIDw8 IGVuZ2luZS0+aWQpOworCQkvKiBpZiBhbGwgaGFuZ3MgYXJlIGNsZWFyZWQsIHRoZW4gY2xlYXIg dGhlIEFMTE9XX0JBTi9FUlJPUiBiaXRzICovCisJCWlmICgoZGV2X3ByaXYtPmdwdV9lcnJvci5z dG9wX3JpbmdzICYgKCgxIDw8IEk5MTVfTlVNX1JJTkdTKSAtIDEpKSA9PSAwKQorCQkJZGV2X3By aXYtPmdwdV9lcnJvci5zdG9wX3JpbmdzID0gMDsKKwl9CisKIAkvKiBTYW1wbGUgdGhlIGN1cnJl bnQgcmluZyBoZWFkIHBvc2l0aW9uICovCiAJaGVhZCA9IEk5MTVfUkVBRF9IRUFEKGVuZ2luZSkg JiBIRUFEX0FERFI7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggOTZmNWEyOC4uMjg0 YmFhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTY0MSw2ICs2NDEsMTYgQEAgc3Rh dGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLCBib29sIHRkcl9yZXMKIAkJfQogCX0KIAorCS8qIENoZWNrIGZvciBhIHNpbXVsYXRl ZCBoYW5nIHJlcXVlc3QgKi8KKwlpZiAoaW50ZWxfcmluZ19zdG9wcGVkKHJpbmcpKSB7CisJCS8q CisJCSAqIE1hcmsgdGhlIHJlcXVlc3QgYXQgdGhlIGhlYWQgb2YgdGhlIHF1ZXVlIGFzIHN1Ym1p dHRlZCBidXQKKwkJICogZG9udCBhY3R1YWxseSBzdWJtaXQgaXQuCisJCSAqLworCQlyZXEwLT5l bHNwX3N1Ym1pdHRlZCsrOworCQlyZXR1cm47CisJfQorCiAJV0FSTl9PTihyZXExICYmIHJlcTEt PmVsc3Bfc3VibWl0dGVkICYmICF0ZHJfcmVzdWJtaXNzaW9uKTsKIAogCWV4ZWNsaXN0c19zdWJt aXRfcmVxdWVzdHMocmVxMCwgcmVxMSwgdGRyX3Jlc3VibWlzc2lvbik7CkBAIC0xMDA2LDE2ICsx MDE2LDEyIEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogc3RhdGljIHZvaWQKIGludGVsX2xvZ2ljYWxfcmlu Z19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0 KQogewotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXF1ZXN0LT5yaW5nOwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJlcXVlc3QtPmk5MTU7CiAKIAlpbnRl bF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyZXF1ZXN0LT5yaW5nYnVmKTsKIAogCXJlcXVlc3QtPnRh aWwgPSByZXF1ZXN0LT5yaW5nYnVmLT50YWlsOwogCi0JaWYgKGludGVsX3Jpbmdfc3RvcHBlZChy aW5nKSkKLQkJcmV0dXJuOwotCiAJaWYgKGRldl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQpCiAJ CWk5MTVfZ3VjX3N1Ym1pdChkZXZfcHJpdi0+Z3VjLmV4ZWNidWZfY2xpZW50LCByZXF1ZXN0KTsK IAllbHNlCkBAIC0zMjUwLDcgKzMyNTYsMTcgQEAgaW50ZWxfZXhlY2xpc3RzX1REUl9nZXRfY3Vy cmVudF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJfQogCiAJaWYgKHRt cGN0eCkgewotCQlzdGF0dXMgPSAoKGh3X2NvbnRleHQgPT0gc3dfY29udGV4dCkgJiYgaHdfYWN0 aXZlKSA/CisJCS8qCisJCSAqIENoZWNrIGZvciBzaW11YXRlZCBoYW5nLiBJbiB0aGlzIGNhc2Ug dGhlIGhlYWQgZW50cnkgaW4gdGhlCisJCSAqIHN3IGV4ZWNsaXN0IHF1ZXVlIHdpbGwgbm90IGhh dmUgYmVlbiBzdWJtaXR0ZWQgdG8gdGhlIEVMU1AsIHNvCisJCSAqIHRoZSBodyBhbmQgc3cgY29u dGV4dCBpZCdzIG1heSB3ZWxsIGRpc2FncmVlLCBidXQgd2Ugc3RpbGwgd2FudAorCQkgKiB0byBw cm9jZWVkIHdpdGggaGFuZyByZWNvdmVyeS4gU28gd2UgcmV0dXJuIE9LIHdoaWNoIGFsbG93cwor CQkgKiB0aGUgVERSIHJlY292ZXJ5IG1lY2hhbmlzbSB0byBwcm9jZWVkIHdpdGggYSByaW5nIHJl c2V0LgorCQkgKi8KKwkJaWYgKGludGVsX3Jpbmdfc3RvcHBlZChyaW5nKSkKKwkJCXN0YXR1cyA9 IENPTlRFWFRfU1VCTUlTU0lPTl9TVEFUVVNfT0s7CisJCWVsc2UKKwkJCXN0YXR1cyA9ICgoaHdf Y29udGV4dCA9PSBzd19jb250ZXh0KSAmJiBod19hY3RpdmUpID8KIAkJCQlDT05URVhUX1NVQk1J U1NJT05fU1RBVFVTX09LIDoKIAkJCQlDT05URVhUX1NVQk1JU1NJT05fU1RBVFVTX0lOQ09OU0lT VEVOVDsKIAl9IGVsc2UgewotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==