From: ville.syrjala@linux.intel.com Subject: [PATCH 1/4] drm/i915: Fix gen4 GPU reset Date: Mon, 19 May 2014 22:25:18 +0300 Message-ID: <1400527521-3454-2-git-send-email-ville.syrjala@linux.intel.com> References: <1400527521-3454-1-git-send-email-ville.syrjala@linux.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 7F41F6E611 for ; Mon, 19 May 2014 12:25:39 -0700 (PDT) In-Reply-To: <1400527521-3454-1-git-send-email-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IHByZS1jdGcgdGhlIHJlc2V0IGJpdCBkaXJlY3RseSBjb250cm9scyB0aGUgcmVzZXQgc2lnbmFs LiBXZSBtdXN0CmFzc2VydCBpdCBmb3IgPj0yMHVzZWMgYW5kIHRoZW4gZGVhc3NlcnQgaXQuIEJp dCAxIGlzIGEgUk8gc3RhdHVzIGJpdAp3aGljaCBzaG91bGQgYWxzbyBnbyBkb3duIHdoZW4gdGhl IHJlc2V0IGlzIG5vIGxvbmdlciBhc3NlcnRlZC4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZWcuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 bmNvcmUuYyB8IDM4ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmls ZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcmVnLmgKaW5kZXggNTQzZjIzYy4uMTM0NmMxZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oCkBAIC04Myw2ICs4Myw3IEBACiAjZGVmaW5lICBHUkRPTV9SRU5ERVIJKDE8PDIpCiAjZGVm aW5lICBHUkRPTV9NRURJQQkoMzw8MikKICNkZWZpbmUgIEdSRE9NX01BU0sJKDM8PDIpCisjZGVm aW5lICBHUkRPTV9SRVNFVF9TVEFUVVMgKDE8PDEpCiAjZGVmaW5lICBHUkRPTV9SRVNFVF9FTkFC TEUgKDE8PDApCiAKICNkZWZpbmUgSUxLX0dEU1IgMHgyY2E0IC8qIE1DSEJBUiBvZmZzZXQgKi8K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggNjczODVhOS4uZjA3M2ZhMCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTk2MCwzNCArOTYwLDI0IEBAIHN0YXRp YyBpbnQgaTk2NV9yZXNldF9jb21wbGV0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXU4 IGdkcnN0OwogCXBjaV9yZWFkX2NvbmZpZ19ieXRlKGRldi0+cGRldiwgSTk2NV9HRFJTVCwgJmdk cnN0KTsKLQlyZXR1cm4gKGdkcnN0ICYgR1JET01fUkVTRVRfRU5BQkxFKSA9PSAwOworCXJldHVy biAoZ2Ryc3QgJiBHUkRPTV9SRVNFVF9TVEFUVVMpID09IDA7CiB9CiAKIHN0YXRpYyBpbnQgaTk2 NV9kb19yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewotCWludCByZXQ7Ci0KLQkvKgot CSAqIFNldCB0aGUgZG9tYWlucyB3ZSB3YW50IHRvIHJlc2V0IChHUkRPTS9iaXRzIDIgYW5kIDMp IGFzCi0JICogd2VsbCBhcyB0aGUgcmVzZXQgYml0IChHUi9iaXQgMCkuICBTZXR0aW5nIHRoZSBH UiBiaXQKLQkgKiB0cmlnZ2VycyB0aGUgcmVzZXQ7IHdoZW4gZG9uZSwgdGhlIGhhcmR3YXJlIHdp bGwgY2xlYXIgaXQuCi0JICovCi0JcGNpX3dyaXRlX2NvbmZpZ19ieXRlKGRldi0+cGRldiwgSTk2 NV9HRFJTVCwKLQkJCSAgICAgIEdSRE9NX1JFTkRFUiB8IEdSRE9NX1JFU0VUX0VOQUJMRSk7Ci0J cmV0ID0gIHdhaXRfZm9yKGk5NjVfcmVzZXRfY29tcGxldGUoZGV2KSwgNTAwKTsKLQlpZiAocmV0 KQotCQlyZXR1cm4gcmV0OwotCi0JcGNpX3dyaXRlX2NvbmZpZ19ieXRlKGRldi0+cGRldiwgSTk2 NV9HRFJTVCwKLQkJCSAgICAgIEdSRE9NX01FRElBIHwgR1JET01fUkVTRVRfRU5BQkxFKTsKLQot CXJldCA9ICB3YWl0X2ZvcihpOTY1X3Jlc2V0X2NvbXBsZXRlKGRldiksIDUwMCk7Ci0JaWYgKHJl dCkKLQkJcmV0dXJuIHJldDsKLQorCS8qIGFzc2VydCByZXNldCBmb3IgYXQgbGVhc3QgMjAgdXNl YyAqLworCXBjaV93cml0ZV9jb25maWdfYnl0ZShkZXYtPnBkZXYsIEk5NjVfR0RSU1QsIEdSRE9N X1JFU0VUX0VOQUJMRSk7CisJdWRlbGF5KDIwKTsKIAlwY2lfd3JpdGVfY29uZmlnX2J5dGUoZGV2 LT5wZGV2LCBJOTY1X0dEUlNULCAwKTsKIAotCXJldHVybiAwOworCXJldHVybiB3YWl0X2Zvcihp OTY1X3Jlc2V0X2NvbXBsZXRlKGRldiksIDUwMCk7Cit9CisKK3N0YXRpYyBpbnQgZzR4X3Jlc2V0 X2NvbXBsZXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJdTggZ2Ryc3Q7CisJcGNpX3Jl YWRfY29uZmlnX2J5dGUoZGV2LT5wZGV2LCBJOTY1X0dEUlNULCAmZ2Ryc3QpOworCXJldHVybiAo Z2Ryc3QgJiBHUkRPTV9SRVNFVF9FTkFCTEUpID09IDA7CiB9CiAKIHN0YXRpYyBpbnQgZzR4X2Rv X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC05OTcsNyArOTg3LDcgQEAgc3RhdGlj IGludCBnNHhfZG9fcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCXBjaV93cml0ZV9j b25maWdfYnl0ZShkZXYtPnBkZXYsIEk5NjVfR0RSU1QsCiAJCQkgICAgICBHUkRPTV9SRU5ERVIg fCBHUkRPTV9SRVNFVF9FTkFCTEUpOwotCXJldCA9ICB3YWl0X2ZvcihpOTY1X3Jlc2V0X2NvbXBs ZXRlKGRldiksIDUwMCk7CisJcmV0ID0gIHdhaXRfZm9yKGc0eF9yZXNldF9jb21wbGV0ZShkZXYp LCA1MDApOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEwMDcsNyArOTk3LDcgQEAg c3RhdGljIGludCBnNHhfZG9fcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCXBjaV93 cml0ZV9jb25maWdfYnl0ZShkZXYtPnBkZXYsIEk5NjVfR0RSU1QsCiAJCQkgICAgICBHUkRPTV9N RURJQSB8IEdSRE9NX1JFU0VUX0VOQUJMRSk7Ci0JcmV0ID0gIHdhaXRfZm9yKGk5NjVfcmVzZXRf Y29tcGxldGUoZGV2KSwgNTAwKTsKKwlyZXQgPSAgd2FpdF9mb3IoZzR4X3Jlc2V0X2NvbXBsZXRl KGRldiksIDUwMCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotLSAKMS44LjUuNQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK