From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v2 2/2] drm/i915: Add a way to test the modeset done during gpu reset, v2. Date: Mon, 11 Apr 2016 08:23:34 +0200 Message-ID: <1460355814-3599-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <57039ADC.4010601@linux.intel.com> <1460355814-3599-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C4746E258 for ; Mon, 11 Apr 2016 06:23:44 +0000 (UTC) In-Reply-To: <1460355814-3599-1-git-send-email-maarten.lankhorst@linux.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 QWRkIGZvcmNlX3Jlc2V0X21vZGVzZXRfdGVzdCBhcyBhIHBhcmFtZXRlciB0byBmb3JjZSB0aGUg bW9kZXNldCBwYXRoIGR1cmluZyBncHUgcmVzZXQuClRoaXMgYWxsb3dzIGEgSUdUIHRlc3QgdG8g c2V0IHRoZSBrbm9iIGFuZCB0cmlnZ2VyIGEgaGFuZyB0byBmb3JjZSB0aGUgZ3B1IHJlc2V0LApl dmVuIG9uIHBsYXRmb3JtcyB0aGF0IHdvdWxkbid0IG90aGVyd2lzZSByZXF1aXJlIGl0LgoKQ2hh bmdlcyBzaW5jZSB2MToKLSBTcGxpdCBvdXQgZml4IHRvIHNlcGFyYXRlIGNvbW1pdC4KClNpZ25l ZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRl bC5jb20+ClRlc3RjYXNlOiBkcnZfaGFuZ21hbi5yZXNldC13aXRoLWZvcmNlZC1tb2Rlc2V0Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyAgIHwgIDYgKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0MiArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKaW5kZXggMTc3OWYwMmU2ZGY4Li44MGNlNTgx NzkzZGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuYwpAQCAtNDUsNiArNDUsNyBAQCBz dHJ1Y3QgaTkxNV9wYXJhbXMgaTkxNSBfX3JlYWRfbW9zdGx5ID0gewogCS5mYXN0Ym9vdCA9IDAs CiAJLnByZWZhdWx0X2Rpc2FibGUgPSAwLAogCS5sb2FkX2RldGVjdF90ZXN0ID0gMCwKKwkuZm9y Y2VfcmVzZXRfbW9kZXNldF90ZXN0ID0gMCwKIAkucmVzZXQgPSB0cnVlLAogCS5pbnZlcnRfYnJp Z2h0bmVzcyA9IDAsCiAJLmRpc2FibGVfZGlzcGxheSA9IDAsCkBAIC0xNTgsNiArMTU5LDExIEBA IE1PRFVMRV9QQVJNX0RFU0MobG9hZF9kZXRlY3RfdGVzdCwKIAkiRm9yY2UtZW5hYmxlIHRoZSBW R0EgbG9hZCBkZXRlY3QgY29kZSBmb3IgdGVzdGluZyAoZGVmYXVsdDpmYWxzZSkuICIKIAkiRm9y IGRldmVsb3BlcnMgb25seS4iKTsKIAorbW9kdWxlX3BhcmFtX25hbWVkX3Vuc2FmZShmb3JjZV9y ZXNldF9tb2Rlc2V0X3Rlc3QsIGk5MTUuZm9yY2VfcmVzZXRfbW9kZXNldF90ZXN0LCBib29sLCAw NjAwKTsKK01PRFVMRV9QQVJNX0RFU0MoZm9yY2VfcmVzZXRfbW9kZXNldF90ZXN0LAorCSJGb3Jj ZSBhIG1vZGVzZXQgZHVyaW5nIGdwdSByZXNldCBmb3IgdGVzdGluZyAoZGVmYXVsdDpmYWxzZSku ICIKKwkiRm9yIGRldmVsb3BlcnMgb25seS4iKTsKKwogbW9kdWxlX3BhcmFtX25hbWVkX3Vuc2Fm ZShpbnZlcnRfYnJpZ2h0bmVzcywgaTkxNS5pbnZlcnRfYnJpZ2h0bmVzcywgaW50LCAwNjAwKTsK IE1PRFVMRV9QQVJNX0RFU0MoaW52ZXJ0X2JyaWdodG5lc3MsCiAJIkludmVydCBiYWNrbGlnaHQg YnJpZ2h0bmVzcyAiCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFt cy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaAppbmRleCAwMmJjMjc4MDQy OTEuLjM5MzRjNDMwMDQyNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9w YXJhbXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCkBAIC01NSw2 ICs1NSw3IEBAIHN0cnVjdCBpOTE1X3BhcmFtcyB7CiAJYm9vbCBmYXN0Ym9vdDsKIAlib29sIHBy ZWZhdWx0X2Rpc2FibGU7CiAJYm9vbCBsb2FkX2RldGVjdF90ZXN0OworCWJvb2wgZm9yY2VfcmVz ZXRfbW9kZXNldF90ZXN0OwogCWJvb2wgcmVzZXQ7CiAJYm9vbCBkaXNhYmxlX2Rpc3BsYXk7CiAJ Ym9vbCBlbmFibGVfZ3VjX3N1Ym1pc3Npb247CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggMmY3NmVmYzg2NDE3Li5mYWYyZGEwODc3OGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTMxNjAsNiArMzE2MCw3IEBAIF9faW50ZWxfZGlzcGxheV9yZXN1 bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogdm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CisJYm9vbCByZXF1aXJlc19kaXNwbGF5X3Jlc2V0ID0g dHJ1ZTsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CiAJc3RydWN0IGRybV9tb2Rl c2V0X2FjcXVpcmVfY3R4ICpwY3R4OwogCWludCByZXQ7CkBAIC0zMTY5LDggKzMxNzAsMTIgQEAg dm9pZCBpbnRlbF9wcmVwYXJlX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJldHVy bjsKIAogCS8qIHJlc2V0IGRvZXNuJ3QgdG91Y2ggdGhlIGRpc3BsYXkgKi8KLQlpZiAoSU5URUxf SU5GTyhkZXYpLT5nZW4gPj0gNSB8fCBJU19HNFgoZGV2KSkKLQkJcmV0dXJuOworCWlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA1IHx8IElTX0c0WChkZXYpKSB7CisJCWlmICghaTkxNS5mb3Jj ZV9yZXNldF9tb2Rlc2V0X3Rlc3QpCisJCQlyZXR1cm47CisKKwkJcmVxdWlyZXNfZGlzcGxheV9y ZXNldCA9IGZhbHNlOworCX0KIAogCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7CiAJcGN0eCA9 IGRldi0+bW9kZV9jb25maWcuYWNxdWlyZV9jdHg7CkBAIC0zMTk5LDEyICszMjA0LDE1IEBAIHZv aWQgaW50ZWxfcHJlcGFyZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiBlcnI6CiAJ ZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKKwlpZiAoIXJlcXVpcmVzX2Rpc3BsYXlfcmVz ZXQpCisJCWRybV9tb2Rlc2V0X3VubG9ja19hbGwoZGV2KTsKIH0KIAogdm9pZCBpbnRlbF9maW5p c2hfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlID0gZGV2X3ByaXYtPm1vZGVzZXRfcmVzdG9yZV9zdGF0ZTsKKwlib29sIGhwZF9pbml0 OwogCWludCByZXQ7CiAKIAkvKgpAQCAtMzIyMCwyMiArMzIyOCwyNyBAQCB2b2lkIGludGVsX2Zp bmlzaF9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJLyogcmVzZXQgZG9lc24ndCB0 b3VjaCB0aGUgZGlzcGxheSAqLwogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1IHx8IElT X0c0WChkZXYpKSB7Ci0JCS8qCi0JCSAqIEZsaXBzIGluIHRoZSByaW5ncyBoYXZlIGJlZW4gbnVr ZWQgYnkgdGhlIHJlc2V0LAotCQkgKiBzbyB1cGRhdGUgdGhlIGJhc2UgYWRkcmVzcyBvZiBhbGwg cHJpbWFyeQotCQkgKiBwbGFuZXMgdG8gdGhlIHRoZSBsYXN0IGZiIHRvIG1ha2Ugc3VyZSB3ZSdy ZQotCQkgKiBzaG93aW5nIHRoZSBjb3JyZWN0IGZiIGFmdGVyIGEgcmVzZXQuCi0JCSAqCi0JCSAq IEZJWE1FOiBBdG9taWMgd2lsbCBtYWtlIHRoaXMgb2Jzb2xldGUgc2luY2Ugd2Ugd29uJ3Qgc2No ZWR1bGUKLQkJICogQ1MtYmFzZWQgZmxpcHMgKHdoaWNoIG1pZ2h0IGdldCBsb3N0IGluIGdwdSBy ZXNldHMpIGFueSBtb3JlLgotCQkgKi8KLQkJaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmVzKGRl dik7Ci0JCXJldHVybjsKKwkJaHBkX2luaXQgPSBmYWxzZTsKKworCQlpZiAoIXN0YXRlKSB7CisJ CQkvKgorCQkJICogRmxpcHMgaW4gdGhlIHJpbmdzIGhhdmUgYmVlbiBudWtlZCBieSB0aGUgcmVz ZXQsCisJCQkgKiBzbyB1cGRhdGUgdGhlIGJhc2UgYWRkcmVzcyBvZiBhbGwgcHJpbWFyeQorCQkJ ICogcGxhbmVzIHRvIHRoZSB0aGUgbGFzdCBmYiB0byBtYWtlIHN1cmUgd2UncmUKKwkJCSAqIHNo b3dpbmcgdGhlIGNvcnJlY3QgZmIgYWZ0ZXIgYSByZXNldC4KKwkJCSAqCisJCQkgKiBGSVhNRTog QXRvbWljIHdpbGwgbWFrZSB0aGlzIG9ic29sZXRlIHNpbmNlIHdlIHdvbid0IHNjaGVkdWxlCisJ CQkgKiBDUy1iYXNlZCBmbGlwcyAod2hpY2ggbWlnaHQgZ2V0IGxvc3QgaW4gZ3B1IHJlc2V0cykg YW55IG1vcmUuCisJCQkgKi8KKwkJCWludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lcyhkZXYpOwor CQkJcmV0dXJuOworCQl9CiAJfSBlbHNlIHsKIAkJLyoKIAkJICogVGhlIGRpc3BsYXkgaGFzIGJl ZW4gcmVzZXQgYXMgd2VsbCwKIAkJICogc28gbmVlZCBhIGZ1bGwgcmUtaW5pdGlhbGl6YXRpb24u CiAJCSAqLworCQlocGRfaW5pdCA9IHRydWU7CiAJCWludGVsX3J1bnRpbWVfcG1fZGlzYWJsZV9p bnRlcnJ1cHRzKGRldl9wcml2KTsKIAkJaW50ZWxfcnVudGltZV9wbV9lbmFibGVfaW50ZXJydXB0 cyhkZXZfcHJpdik7CiAKQEAgLTMyNTUsNyArMzI2OCw4IEBAIHZvaWQgaW50ZWxfZmluaXNoX3Jl c2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaWYgKHJldCkKIAkJRFJNX0VSUk9SKCJSZXN0 b3Jpbmcgb2xkIHN0YXRlIGZhaWxlZCB3aXRoICVpXG4iLCByZXQpOwogCi0JaW50ZWxfaHBkX2lu aXQoZGV2X3ByaXYpOworCWlmIChocGRfaW5pdCkKKwkJaW50ZWxfaHBkX2luaXQoZGV2X3ByaXYp OwogCiAJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwogfQotLSAKMi4xLjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=