From: Imre Deak Subject: [PATCH v3 3/3] drm/i915: fix HW lockup due to missing RPS IRQ workaround on GEN6 Date: Fri, 19 Dec 2014 18:52:36 +0200 Message-ID: <1419007956-4887-3-git-send-email-imre.deak@intel.com> References: <1419007956-4887-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 3BABC6E9D3 for ; Fri, 19 Dec 2014 08:57:25 -0800 (PST) In-Reply-To: <1419007956-4887-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 ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgfCAyMCArKysrKysrKysrKysrKysrKyst LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jICB8IDE0ICstLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDIwIGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CmluZGV4IGFhMzE4MGMuLjgxOGFiNGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjk2 LDYgKzI5NiwyMyBAQCB2b2lkIGdlbjZfZW5hYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogfQog Cit1MzIgZ2VuNl9zYW5pdGl6ZV9ycHNfcG1fbWFzayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsIHUzMiBtYXNrKQoreworCS8qCisJICogU05CLElWQiBjYW4gd2hpbGUgVkxWLENI ViBtYXkgaGFyZCBoYW5nIG9uIGxvb3BpbmcgYmF0Y2hidWZmZXIKKwkgKiBpZiBHRU42X1BNX1VQ X0VJX0VYUElSRUQgaXMgbWFza2VkLgorCSAqCisJICogVE9ETzogdmVyaWZ5IGlmIHRoaXMgY2Fu IGJlIHJlcHJvZHVjZWQgb24gVkxWLENIVi4KKwkgKi8KKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJp diktPmdlbiA8PSA3ICYmICFJU19IQVNXRUxMKGRldl9wcml2KSkKKwkJbWFzayAmPSB+R0VONl9Q TV9SUF9VUF9FSV9FWFBJUkVEOworCisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0g OCkKKwkJbWFzayAmPSB+R0VOOF9QTUlOVFJfUkVESVJFQ1RfVE9fTk9OX0RJU1A7CisKKwlyZXR1 cm4gbWFzazsKK30KKwogdm9pZCBnZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwpAQCAtMzA4LDggKzMyNSw3IEBAIHZvaWQgZ2VuNl9kaXNhYmxlX3Jw c19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlzcGluX2xvY2tfaXJxKCZk ZXZfcHJpdi0+aXJxX2xvY2spOwogCi0JSTkxNV9XUklURShHRU42X1BNSU5UUk1TSywgSU5URUxf SU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4ID8KLQkJICAgfkdFTjhfUE1JTlRSX1JFRElSRUNUX1RP X05PTl9ESVNQIDogfjApOworCUk5MTVfV1JJVEUoR0VONl9QTUlOVFJNU0ssIGdlbjZfc2FuaXRp emVfcnBzX3BtX21hc2soZGV2X3ByaXYsIH4wKSk7CiAKIAlfX2dlbjZfZGlzYWJsZV9wbV9pcnEo ZGV2X3ByaXYsIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzKTsKIAlJOTE1X1dSSVRFKGdlbjZfcG1f aWVyKGRldl9wcml2KSwgSTkxNV9SRUFEKGdlbjZfcG1faWVyKGRldl9wcml2KSkgJgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaAppbmRleCA1ODhiNjE4Li5iYjg3MWYzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaApAQCAtNzk1LDYgKzc5NSw3IEBAIHZvaWQgZ2VuNl9kaXNhYmxlX3BtX2lycShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHVpbnQzMl90IG1hc2spOwogdm9pZCBn ZW42X3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBn ZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQg Z2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordTMy IGdlbjZfc2FuaXRpemVfcnBzX3BtX21hc2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCB1MzIgbWFzayk7CiB2b2lkIGludGVsX3J1bnRpbWVfcG1fZGlzYWJsZV9pbnRlcnJ1cHRz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3J1bnRpbWVf cG1fZW5hYmxlX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK IHN0YXRpYyBpbmxpbmUgYm9vbCBpbnRlbF9pcnFzX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggYmE0ZTY2Ny4uN2Q5 OWE5YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0zNzQ1LDE5ICszNzQ1LDcgQEAgc3Rh dGljIHUzMiBnZW42X3Jwc19wbV9tYXNrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgdTggdmFsKQogCW1hc2sgfD0gZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMgJiAoR0VONl9QTV9S UF9ET1dOX0VJX0VYUElSRUQgfCBHRU42X1BNX1JQX1VQX0VJX0VYUElSRUQpOwogCW1hc2sgJj0g ZGV2X3ByaXYtPnBtX3Jwc19ldmVudHM7CiAKLQkvKgotCSAqIFNOQixJVkIgY2FuIHdoaWxlIFZM VixDSFYgbWF5IGhhcmQgaGFuZyBvbiBsb29waW5nIGJhdGNoYnVmZmVyCi0JICogaWYgR0VONl9Q TV9VUF9FSV9FWFBJUkVEIGlzIG1hc2tlZC4KLQkgKgotCSAqIFRPRE86IHZlcmlmeSBpZiB0aGlz IGNhbiBiZSByZXByb2R1Y2VkIG9uIFZMVixDSFYuCi0JICovCi0JaWYgKElOVEVMX0lORk8oZGV2 X3ByaXYtPmRldiktPmdlbiA8PSA3ICYmICFJU19IQVNXRUxMKGRldl9wcml2LT5kZXYpKQotCQlt YXNrIHw9IEdFTjZfUE1fUlBfVVBfRUlfRVhQSVJFRDsKLQotCWlmIChJTlRFTF9JTkZPKGRldl9w cml2KS0+Z2VuID49IDgpCi0JCW1hc2sgfD0gR0VOOF9QTUlOVFJfUkVESVJFQ1RfVE9fTk9OX0RJ U1A7Ci0KLQlyZXR1cm4gfm1hc2s7CisJcmV0dXJuIGdlbjZfc2FuaXRpemVfcnBzX3BtX21hc2so ZGV2X3ByaXYsIH5tYXNrKTsKIH0KIAogLyogZ2VuNl9zZXRfcnBzIGlzIGNhbGxlZCB0byB1cGRh dGUgdGhlIGZyZXF1ZW5jeSByZXF1ZXN0LCBidXQgc2hvdWxkIGFsc28gYmUKLS0gCjEuOC40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=