From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 2/2] drm/i915: fix HW lockup due to missing RPS IRQ workaround on GEN6 Date: Fri, 19 Dec 2014 14:51:57 +0200 Message-ID: <1418993517-9324-2-git-send-email-imre.deak@intel.com> References: <1418993517-9324-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 E6C156E654 for ; Fri, 19 Dec 2014 04:52:01 -0800 (PST) In-Reply-To: <1418993517-9324-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 LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICB8IDE4ICsrKysrKysrKysrKysr KystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDExICstLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQs IDE4IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CmluZGV4IGFhMzE4MGMuLmY4NTNmMjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAtMjk2 LDYgKzI5NiwyMSBAQCB2b2lkIGdlbjZfZW5hYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogfQog Cit1MzIgZ2VuNl9zYW5pdGl6ZV9ycHNfcG1fbWFzayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsIHUzMiBtYXNrKQoreworCS8qCisJICogSVZCIGFuZCBTTkIgaGFyZCBoYW5ncyBv biBsb29waW5nIGJhdGNoYnVmZmVyCisJICogaWYgR0VONl9QTV9VUF9FSV9FWFBJUkVEIGlzIG1h c2tlZC4KKwkgKi8KKwlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA8PSA3ICYmICFJU19I QVNXRUxMKGRldl9wcml2KSkKKwkJbWFzayAmPSB+R0VONl9QTV9SUF9VUF9FSV9FWFBJUkVEOwor CisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOCkKKwkJbWFzayAmPSB+R0VOOF9Q TUlOVFJfUkVESVJFQ1RfVE9fTk9OX0RJU1A7CisKKwlyZXR1cm4gbWFzazsKK30KKwogdm9pZCBn ZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAt MzA4LDggKzMyMyw3IEBAIHZvaWQgZ2VuNl9kaXNhYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAKIAlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwog Ci0JSTkxNV9XUklURShHRU42X1BNSU5UUk1TSywgSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+ PSA4ID8KLQkJICAgfkdFTjhfUE1JTlRSX1JFRElSRUNUX1RPX05PTl9ESVNQIDogfjApOworCUk5 MTVfV1JJVEUoR0VONl9QTUlOVFJNU0ssIGdlbjZfc2FuaXRpemVfcnBzX3BtX21hc2soZGV2X3By aXYsIH4wKSk7CiAKIAlfX2dlbjZfZGlzYWJsZV9wbV9pcnEoZGV2X3ByaXYsIGRldl9wcml2LT5w bV9ycHNfZXZlbnRzKTsKIAlJOTE1X1dSSVRFKGdlbjZfcG1faWVyKGRldl9wcml2KSwgSTkxNV9S RUFEKGdlbjZfcG1faWVyKGRldl9wcml2KSkgJgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRl eCA1ODhiNjE4Li5iYjg3MWYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNzk1LDYg Kzc5NSw3IEBAIHZvaWQgZ2VuNl9kaXNhYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIHVpbnQzMl90IG1hc2spOwogdm9pZCBnZW42X3Jlc2V0X3Jwc19pbnRlcnJ1 cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBnZW42X2VuYWJsZV9ycHNfaW50ZXJy dXB0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgZ2VuNl9kaXNhYmxlX3Jwc19pbnRl cnJ1cHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordTMyIGdlbjZfc2FuaXRpemVfcnBzX3Bt X21hc2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgbWFzayk7CiB2b2lk IGludGVsX3J1bnRpbWVfcG1fZGlzYWJsZV9pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX3J1bnRpbWVfcG1fZW5hYmxlX2ludGVycnVwdHMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHN0YXRpYyBpbmxpbmUgYm9vbCBp bnRlbF9pcnFzX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZjFmMDZkNy4uNGJkMWI4YiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCkBAIC0zNzQ1LDE2ICszNzQ1LDcgQEAgc3RhdGljIHUzMiBnZW42X3Jwc19wbV9t YXNrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTggdmFsKQogCW1hc2sgfD0g ZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMgJiAoR0VONl9QTV9SUF9ET1dOX0VJX0VYUElSRUQgfCBH RU42X1BNX1JQX1VQX0VJX0VYUElSRUQpOwogCW1hc2sgJj0gZGV2X3ByaXYtPnBtX3Jwc19ldmVu dHM7CiAKLQkvKiBJVkIgYW5kIFNOQiBoYXJkIGhhbmdzIG9uIGxvb3BpbmcgYmF0Y2hidWZmZXIK LQkgKiBpZiBHRU42X1BNX1VQX0VJX0VYUElSRUQgaXMgbWFza2VkLgotCSAqLwotCWlmIChJTlRF TF9JTkZPKGRldl9wcml2LT5kZXYpLT5nZW4gPD0gNyAmJiAhSVNfSEFTV0VMTChkZXZfcHJpdi0+ ZGV2KSkKLQkJbWFzayB8PSBHRU42X1BNX1JQX1VQX0VJX0VYUElSRUQ7Ci0KLQlpZiAoSU5URUxf SU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4KQotCQltYXNrIHw9IEdFTjhfUE1JTlRSX1JFRElSRUNU X1RPX05PTl9ESVNQOwotCi0JcmV0dXJuIH5tYXNrOworCXJldHVybiBnZW42X3Nhbml0aXplX3Jw c19wbV9tYXNrKGRldl9wcml2LCB+bWFzayk7CiB9CiAKIC8qIGdlbjZfc2V0X3JwcyBpcyBjYWxs ZWQgdG8gdXBkYXRlIHRoZSBmcmVxdWVuY3kgcmVxdWVzdCwgYnV0IHNob3VsZCBhbHNvIGJlCi0t IAoxLjguNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK