From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 4/6] drm/i915: Implement GPU reset for g33 Date: Fri, 21 Nov 2014 21:54:28 +0200 Message-ID: <1416599670-21914-5-git-send-email-ville.syrjala@linux.intel.com> References: <1416599670-21914-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id C09166F1EC for ; Fri, 21 Nov 2014 11:54:58 -0800 (PST) In-Reply-To: <1416599670-21914-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmcz MyBzZWVtcyB0byBzaXQgc29tZXdoZXJlIGJldHdlZW4gdGhlIDkxNS85NDUvOTY1IHN0eWxlIGFu ZCB0aGUKZzR4IHN0eWxlLiBUaGUgYml0cyBsb29rIGxpa2UgZzR4LCBidXQgd2Ugc3RpbGwgbmVl ZCB0byBkbyBhIGZ1bGwKcmVzZXQgaW5jbHVkaW5nIGRpc3BsYXkuCgpTaWduZWQtb2ZmLWJ5OiBW aWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdW5jb3JlLmMgfCAxMiArKysrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwg MTMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpp bmRleCA0NGFiZDdiLi41MDY2ZmQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTg4MSw4 ICs4ODEsOCBAQCBpbnQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAo SU5URUxfSU5GTyhkZXYpLT5nZW4gPiA1KQogCQkJaW50ZWxfcmVzZXRfZ3RfcG93ZXJzYXZlKGRl dik7CiAKLQkJaWYgKChJU19HRU4zKGRldikgJiYgIUlTX0czMyhkZXYpKSB8fAotCQkgICAgKElT X0dFTjQoZGV2KSAmJiAhSVNfRzRYKGRldikpKSB7CisKKwkJaWYgKElTX0dFTjMoZGV2KSB8fCAo SVNfR0VONChkZXYpICYmICFJU19HNFgoZGV2KSkpIHsKIAkJCWludGVsX3J1bnRpbWVfcG1fZGlz YWJsZV9pbnRlcnJ1cHRzKGRldl9wcml2KTsKIAkJCWludGVsX3J1bnRpbWVfcG1fZW5hYmxlX2lu dGVycnVwdHMoZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4 IDU0ZjgyNjUuLjBmNjkzNjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCkBAIC0x MzY5LDYgKzEzNjksMTQgQEAgc3RhdGljIGludCBnNHhfcmVzZXRfY29tcGxldGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlyZXR1cm4gKGdkcnN0ICYgR1JET01fUkVTRVRfRU5BQkxFKSA9PSAw OwogfQogCitzdGF0aWMgaW50IGczM19kb19yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQor eworCS8qIEZJWE1FIHNwZWMgc2F5cyB0byB0dXJuIG9mZiBhbGwgcGxhbmVzIGFuZCB3YWl0IDEg dXNlYyBiZWZvcmUgcmVzZXQgKi8KKworCXBjaV93cml0ZV9jb25maWdfYnl0ZShkZXYtPnBkZXYs IEk5MTVfR0RSU1QsIEdSRE9NX1JFU0VUX0VOQUJMRSk7CisJcmV0dXJuIHdhaXRfZm9yKGc0eF9y ZXNldF9jb21wbGV0ZShkZXYpLCA1MDApOworfQorCiBzdGF0aWMgaW50IGc0eF9kb19yZXNldChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CkBAIC0xNDUyLDcgKzE0NjAsOSBAQCBpbnQgaW50ZWxf Z3B1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXJldHVybiBpcm9ubGFrZV9kb19y ZXNldChkZXYpOwogCWVsc2UgaWYgKElTX0c0WChkZXYpKQogCQlyZXR1cm4gZzR4X2RvX3Jlc2V0 KGRldik7Ci0JZWxzZSBpZiAoSVNfR0VONChkZXYpIHx8IChJU19HRU4zKGRldikgJiYgICFJU19H MzMoZGV2KSkpCisJZWxzZSBpZiAoSVNfRzMzKGRldikpCisJCXJldHVybiBnMzNfZG9fcmVzZXQo ZGV2KTsKKwllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSAzKQogCQlyZXR1cm4gaTkx NV9kb19yZXNldChkZXYpOwogCWVsc2UKIAkJcmV0dXJuIC1FTk9ERVY7Ci0tIAoyLjAuNAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK