From: Imre Deak Subject: [PATCH] drm/i915: fix HW lockup due to missing RPS IRQ workaround on GEN6 Date: Fri, 19 Dec 2014 11:53:21 +0200 Message-ID: <1418982801-27500-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id D8C466E3E9 for ; Fri, 19 Dec 2014 01:53:35 -0800 (PST) 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 aWVkLgoKQXQgdGhlIHNhbWUgdGltZSBhbHNvIGtlZXAgdGhlIElSUSByb3V0aW5nIHRvIGRpc3Bs YXkgZW5hYmxlZCBhdCBhbGwKdGltZXMgYW5kIGV2ZXJ5d2hlcmUgb24gR0VOOCssIHNpbmNlIHRo ZXJlIGlzbid0IGV2ZXIgYSByZWFzb24gdG8gcm91dGUKdGhlbSB0byBHVC4gRm9yIGluc3RhbmNl IHRoaXMgd2F5IHdlIGNvdWxkIGNhdGNoIHNwdXJpb3VzIGludGVycnVwdHMgb24KdGhlIENQVSBp bnN0ZWFkIG9mIGFsbG93aW5nIHNvbWUgdW5kZWZpbmVkIGJlaGF2aW91ciBvbiB0aGUgR1QgKGR1 ZSB0bwp0aGUgc2FtZSBzcHVyaW91cyBpbnRlcnJ1cHQgcm91dGVkIHRoZXJlKS4KClRlc3RjYXNl OiBpZ3QvZ2VtX3Jlc2V0X3N0YXRzL2Jhbi1jdHgtcmVuZGVyCkJ1Z3ppbGxhOiBodHRwczovL2J1 Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD04NzQyOQpTaWduZWQtb2ZmLWJ5OiBJ bXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYyAgfCAxNyArKysrKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDEx ICstLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDEyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IGFhMzE4MGMuLjEyYWNjNDAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjk2LDYgKzI5NiwyMCBAQCB2b2lkIGdlbjZfZW5h YmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3Bpbl91bmxvY2tf aXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogfQogCit1MzIgZ2VuNl9zYW5pdGl6ZV9ycHNfcG1f bWFzayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBtYXNrKQoreworCS8q IElWQiBhbmQgU05CIGhhcmQgaGFuZ3Mgb24gbG9vcGluZyBiYXRjaGJ1ZmZlcgorCSAqIGlmIEdF TjZfUE1fVVBfRUlfRVhQSVJFRCBpcyBtYXNrZWQuCisJICovCisJaWYgKElOVEVMX0lORk8oZGV2 X3ByaXYtPmRldiktPmdlbiA8PSA3ICYmICFJU19IQVNXRUxMKGRldl9wcml2LT5kZXYpKQorCQlt YXNrICY9IH5HRU42X1BNX1JQX1VQX0VJX0VYUElSRUQ7CisKKwlpZiAoSU5URUxfSU5GTyhkZXZf cHJpdi0+ZGV2KS0+Z2VuID49IDgpCisJCW1hc2sgJj0gfkdFTjhfUE1JTlRSX1JFRElSRUNUX1RP X05PTl9ESVNQOworCisJcmV0dXJuIG1hc2s7Cit9CisKIHZvaWQgZ2VuNl9kaXNhYmxlX3Jwc19p bnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTMwOCw4ICszMjIsNyBAQCB2 b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAotCUk5MTVfV1JJVEUoR0VO Nl9QTUlOVFJNU0ssIElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOCA/Ci0JCSAgIH5HRU44 X1BNSU5UUl9SRURJUkVDVF9UT19OT05fRElTUCA6IH4wKTsKKwlJOTE1X1dSSVRFKEdFTjZfUE1J TlRSTVNLLCBnZW42X3Nhbml0aXplX3Jwc19wbV9tYXNrKGRldl9wcml2LCB+MCkpOwogCiAJX19n ZW42X2Rpc2FibGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CiAJ STkxNV9XUklURShnZW42X3BtX2llcihkZXZfcHJpdiksIEk5MTVfUkVBRChnZW42X3BtX2llcihk ZXZfcHJpdikpICYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNTg4YjYxOC4uYmI4NzFm MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTc5NSw2ICs3OTUsNyBAQCB2b2lkIGdl bjZfZGlzYWJsZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50 MzJfdCBtYXNrKTsKIHZvaWQgZ2VuNl9yZXNldF9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KTsKIHZvaWQgZ2VuNl9lbmFibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7CiB2b2lkIGdlbjZfZGlzYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKK3UzMiBnZW42X3Nhbml0aXplX3Jwc19wbV9tYXNrKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc2spOwogdm9pZCBpbnRlbF9ydW50aW1lX3Bt X2Rpc2FibGVfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwog dm9pZCBpbnRlbF9ydW50aW1lX3BtX2VuYWJsZV9pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CiBzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxfaXJxc19lbmFibGVk KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IGEzZWJhYTguLjRiZDFiOGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzc0 NSwxNiArMzc0NSw3IEBAIHN0YXRpYyB1MzIgZ2VuNl9ycHNfcG1fbWFzayhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHU4IHZhbCkKIAltYXNrIHw9IGRldl9wcml2LT5wbV9ycHNf ZXZlbnRzICYgKEdFTjZfUE1fUlBfRE9XTl9FSV9FWFBJUkVEIHwgR0VONl9QTV9SUF9VUF9FSV9F WFBJUkVEKTsKIAltYXNrICY9IGRldl9wcml2LT5wbV9ycHNfZXZlbnRzOwogCi0JLyogSVZCIGFu ZCBTTkIgaGFyZCBoYW5ncyBvbiBsb29waW5nIGJhdGNoYnVmZmVyCi0JICogaWYgR0VONl9QTV9V UF9FSV9FWFBJUkVEIGlzIG1hc2tlZC4KLQkgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdi0+ ZGV2KS0+Z2VuIDw9IDcgJiYgIUlTX0hBU1dFTEwoZGV2X3ByaXYtPmRldikpCi0JCW1hc2sgfD0g R0VONl9QTV9SUF9VUF9FSV9FWFBJUkVEOwotCi0JaWYgKElTX0dFTjgoZGV2X3ByaXYtPmRldikp Ci0JCW1hc2sgfD0gR0VOOF9QTUlOVFJfUkVESVJFQ1RfVE9fTk9OX0RJU1A7Ci0KLQlyZXR1cm4g fm1hc2s7CisJcmV0dXJuIGdlbjZfc2FuaXRpemVfcnBzX3BtX21hc2soZGV2X3ByaXYsIH5tYXNr KTsKIH0KIAogLyogZ2VuNl9zZXRfcnBzIGlzIGNhbGxlZCB0byB1cGRhdGUgdGhlIGZyZXF1ZW5j eSByZXF1ZXN0LCBidXQgc2hvdWxkIGFsc28gYmUKLS0gCjEuOC40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=