From: Imre Deak Subject: [PATCH v4 2/3] drm/i915: fix HW lockup due to missing RPS IRQ workaround on GEN6 Date: Fri, 19 Dec 2014 19:33:26 +0200 Message-ID: <1419010407-22504-2-git-send-email-imre.deak@intel.com> References: <1419010407-22504-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id AF4726E079 for ; Fri, 19 Dec 2014 09:35:38 -0800 (PST) In-Reply-To: <1419010407-22504-1-git-send-email-imre.deak@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 SW4KCmNvbW1pdCBkYmVhM2NlYTY5NTA4ZTlkNTQ4ZWQ0YTZiZTEzZGUzNTQ5MmU1ZDE1CkF1dGhv cjogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpEYXRlOiAgIE1vbiBEZWMgMTUgMTg6 NTk6MjggMjAxNCArMDIwMAoKICAgIGRybS9pOTE1OiBzYW5pdGl6ZSBSUFMgcmVzZXR0aW5nIGR1 cmluZyBHUFUgcmVzZXQKCndlIGRpc2FibGUgUlBTIGludGVycnVwdHMgZHVyaW5nIEdQVSByZXNl dHRpbmcsIGJ1dCBkb24ndCBhcHBseSB0aGUKbmVjZXNzYXJ5IEdFTjYgSFcgd29ya2Fyb3VuZC4g VGhpcyBsZWFkcyB0byBhIEhXIGxvY2t1cCBkdXJpbmcgYQpzdWJzZXF1ZW50ICJsb29waW5nIGJh dGNoYnVmZmVyIiB3b3JrbG9hZC4gVGhpcyBpcyB0cmlnZ2VyZWQgYnkgdGhlCnRlc3RjYXNlIHRo YXQgc3VibWl0cyBleGFjdGx5IHRoaXMga2luZCBvZiB3b3JrbG9hZCBhZnRlciBhIHNpbXVsYXRl ZApHUFUgcmVzZXQuIEknbSBub3Qgc3VyZSBob3cgbGlrZWx5IHRoZSBidWcgd291bGQgaGF2ZSB0 cmlnZ2VyZWQKb3RoZXJ3aXNlLCBzaW5jZSB3ZSB3b3VsZCBoYXZlIGFwcGxpZWQgdGhlIHdvcmth cm91bmQgYW55d2F5IHNob3J0bHkKYWZ0ZXIgdGhlIEdQVSByZXNldCwgd2hlbiBlbmFibGluZyBH VCBwb3dlcnNhdmluZyBmcm9tIHRoZSBkZWZlcnJlZAp3b3JrLgoKVGhpcyBtYXkgYWxzbyBmaXgg dW5yZWxhdGVkIGlzc3Vlcywgc2luY2UgZHVyaW5nIGRyaXZlciBsb2FkaW5nIC8Kc3VzcGVuZGlu ZyB3ZSBhbHNvIGRpc2FibGUgUlBTIGludGVycnVwdHMgYW5kIHNvIHdlIGFsc28gaGFkIGEgc2hv cnQKd2luZG93IGR1cmluZyB0aGUgcmVzdCBvZiB0aGUgbG9hZGluZyAvIHJlc3VtaW5nIHdoZXJl IGEgc2ltaWxhcgp3b3JrbG9hZCBjb3VsZCBydW4gd2l0aG91dCB0aGUgd29ya2Fyb3VuZCBhcHBs aWVkLgoKdjI6Ci0gc2VwYXJhdGUgdGhlIGZpeCB0byByb3V0ZSBSUFMgaW50ZXJydXB0cyB0byB0 aGUgQ1BVIG9uIEdFTjkgdG9vCiAgdG8gYSBzZXBhcmF0ZSBwYXRjaCAoRGFuaWVsKQoKQmlzZWN0 ZWQtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9s aXZlaXJhQGludGVsLmNvbT4KVGVzdGNhc2U6IGlndC9nZW1fcmVzZXRfc3RhdHMvYmFuLWN0eC1y ZW5kZXIKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dp P2lkPTg3NDI5ClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgfCAxOCArKysrKysrKysrKysrKysrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyAgfCAxMSArLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxOCBp bnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRl eCBhYTMxODBjLi5mODUzZjI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTI5Niw2ICsy OTYsMjEgQEAgdm9pZCBnZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIH0KIAordTMy IGdlbjZfc2FuaXRpemVfcnBzX3BtX21hc2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCB1MzIgbWFzaykKK3sKKwkvKgorCSAqIElWQiBhbmQgU05CIGhhcmQgaGFuZ3Mgb24gbG9v cGluZyBiYXRjaGJ1ZmZlcgorCSAqIGlmIEdFTjZfUE1fVVBfRUlfRVhQSVJFRCBpcyBtYXNrZWQu CisJICovCisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPD0gNyAmJiAhSVNfSEFTV0VM TChkZXZfcHJpdikpCisJCW1hc2sgJj0gfkdFTjZfUE1fUlBfVVBfRUlfRVhQSVJFRDsKKworCWlm IChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID49IDgpCisJCW1hc2sgJj0gfkdFTjhfUE1JTlRS X1JFRElSRUNUX1RPX05PTl9ESVNQOworCisJcmV0dXJuIG1hc2s7Cit9CisKIHZvaWQgZ2VuNl9k aXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTMwOCw4 ICszMjMsNyBAQCB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAotCUk5 MTVfV1JJVEUoR0VONl9QTUlOVFJNU0ssIElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOCA/ Ci0JCSAgIH5HRU44X1BNSU5UUl9SRURJUkVDVF9UT19OT05fRElTUCA6IH4wKTsKKwlJOTE1X1dS SVRFKEdFTjZfUE1JTlRSTVNLLCBnZW42X3Nhbml0aXplX3Jwc19wbV9tYXNrKGRldl9wcml2LCB+ MCkpOwogCiAJX19nZW42X2Rpc2FibGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBz X2V2ZW50cyk7CiAJSTkxNV9XUklURShnZW42X3BtX2llcihkZXZfcHJpdiksIEk5MTVfUkVBRChn ZW42X3BtX2llcihkZXZfcHJpdikpICYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNTg4 YjYxOC4uYmI4NzFmMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTc5NSw2ICs3OTUs NyBAQCB2b2lkIGdlbjZfZGlzYWJsZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LCB1aW50MzJfdCBtYXNrKTsKIHZvaWQgZ2VuNl9yZXNldF9ycHNfaW50ZXJydXB0cyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgZ2VuNl9lbmFibGVfcnBzX2ludGVycnVwdHMo c3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0 cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3UzMiBnZW42X3Nhbml0aXplX3Jwc19wbV9tYXNr KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc2spOwogdm9pZCBpbnRl bF9ydW50aW1lX3BtX2Rpc2FibGVfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9ydW50aW1lX3BtX2VuYWJsZV9pbnRlcnJ1cHRzKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxf aXJxc19lbmFibGVkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCmluZGV4IGYxZjA2ZDcuLjRiZDFiOGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYwpAQCAtMzc0NSwxNiArMzc0NSw3IEBAIHN0YXRpYyB1MzIgZ2VuNl9ycHNfcG1fbWFzayhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHU4IHZhbCkKIAltYXNrIHw9IGRldl9w cml2LT5wbV9ycHNfZXZlbnRzICYgKEdFTjZfUE1fUlBfRE9XTl9FSV9FWFBJUkVEIHwgR0VONl9Q TV9SUF9VUF9FSV9FWFBJUkVEKTsKIAltYXNrICY9IGRldl9wcml2LT5wbV9ycHNfZXZlbnRzOwog Ci0JLyogSVZCIGFuZCBTTkIgaGFyZCBoYW5ncyBvbiBsb29waW5nIGJhdGNoYnVmZmVyCi0JICog aWYgR0VONl9QTV9VUF9FSV9FWFBJUkVEIGlzIG1hc2tlZC4KLQkgKi8KLQlpZiAoSU5URUxfSU5G TyhkZXZfcHJpdi0+ZGV2KS0+Z2VuIDw9IDcgJiYgIUlTX0hBU1dFTEwoZGV2X3ByaXYtPmRldikp Ci0JCW1hc2sgfD0gR0VONl9QTV9SUF9VUF9FSV9FWFBJUkVEOwotCi0JaWYgKElOVEVMX0lORk8o ZGV2X3ByaXYpLT5nZW4gPj0gOCkKLQkJbWFzayB8PSBHRU44X1BNSU5UUl9SRURJUkVDVF9UT19O T05fRElTUDsKLQotCXJldHVybiB+bWFzazsKKwlyZXR1cm4gZ2VuNl9zYW5pdGl6ZV9ycHNfcG1f bWFzayhkZXZfcHJpdiwgfm1hc2spOwogfQogCiAvKiBnZW42X3NldF9ycHMgaXMgY2FsbGVkIHRv IHVwZGF0ZSB0aGUgZnJlcXVlbmN5IHJlcXVlc3QsIGJ1dCBzaG91bGQgYWxzbyBiZQotLSAKMS44 LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==