From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:49320 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758082AbcDEM4f (ORCPT ); Tue, 5 Apr 2016 08:56:35 -0400 From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Cc: Abdiel Janulgue , Ben Widawsky , Timo Aaltonen , Subject: [PATCH 1/2] drm/i915/skl: Fix rc6 based gpu/system hang Date: Tue, 5 Apr 2016 15:56:16 +0300 Message-Id: <1459860977-27751-1-git-send-email-mika.kuoppala@intel.com> Sender: stable-owner@vger.kernel.org List-ID: For all gt3 and gt4 skylake variants, extend the usage of WaRsDisableCoarsePowerGating for all revisions. Without this gt3 and gt4 skylakes up to atleast rev 0xa can gpu hang or system hang. Cc: Abdiel Janulgue Cc: Ben Widawsky Cc: Timo Aaltonen Cc: Reported-by: Mikael Djurfeldt References: https://bugs.freedesktop.org/show_bug.cgi?id=94161 Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_drv.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 10480939159c..daba7ebb9699 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2634,8 +2634,9 @@ struct drm_i915_cmd_table { /* WaRsDisableCoarsePowerGating:skl,bxt */ #define NEEDS_WaRsDisableCoarsePowerGating(dev) (IS_BXT_REVID(dev, 0, BXT_REVID_A1) || \ - ((IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) && \ - IS_SKL_REVID(dev, 0, SKL_REVID_F0))) + IS_SKL_GT3(dev) || \ + IS_SKL_GT4(dev)) + /* * dp aux and gmbus irq on gen4 seems to be able to generate legacy interrupts * even when in MSI mode. This results in spurious interrupt warnings if the -- 2.5.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH 1/2] drm/i915/skl: Fix rc6 based gpu/system hang Date: Tue, 5 Apr 2016 15:56:16 +0300 Message-ID: <1459860977-27751-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 355ED6E23B for ; Tue, 5 Apr 2016 12:56:32 +0000 (UTC) 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 Cc: stable@vger.kernel.org, Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org Rm9yIGFsbCBndDMgYW5kIGd0NCBza3lsYWtlIHZhcmlhbnRzLCBleHRlbmQgdGhlIHVzYWdlIG9m CldhUnNEaXNhYmxlQ29hcnNlUG93ZXJHYXRpbmcgZm9yIGFsbCByZXZpc2lvbnMuIFdpdGhvdXQg dGhpcwpndDMgYW5kIGd0NCBza3lsYWtlcyB1cCB0byBhdGxlYXN0IHJldiAweGEgY2FuIGdwdSBo YW5nIG9yCnN5c3RlbSBoYW5nLgoKQ2M6IEFiZGllbCBKYW51bGd1ZSA8YWJkaWVsLmphbnVsZ3Vl QGxpbnV4LmludGVsLmNvbT4KQ2M6IEJlbiBXaWRhd3NreSA8YmVuamFtaW4ud2lkYXdza3lAaW50 ZWwuY29tPgpDYzogVGltbyBBYWx0b25lbiA8dGphYWx0b25AdWJ1bnR1LmNvbT4KQ2M6IDxzdGFi bGVAdmdlci5rZXJuZWwub3JnPgpSZXBvcnRlZC1ieTogTWlrYWVsIERqdXJmZWxkdCA8bWlrYWVs QGRqdXJmZWxkdC5jb20+ClJlZmVyZW5jZXM6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcv c2hvd19idWcuY2dpP2lkPTk0MTYxClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eu a3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg fCA1ICsrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDEwNDgwOTM5MTU5Yy4uZGFiYTdlYmI5Njk5 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2MzQsOCArMjYzNCw5IEBAIHN0cnVjdCBk cm1faTkxNV9jbWRfdGFibGUgewogCiAvKiBXYVJzRGlzYWJsZUNvYXJzZVBvd2VyR2F0aW5nOnNr bCxieHQgKi8KICNkZWZpbmUgTkVFRFNfV2FSc0Rpc2FibGVDb2Fyc2VQb3dlckdhdGluZyhkZXYp IChJU19CWFRfUkVWSUQoZGV2LCAwLCBCWFRfUkVWSURfQTEpIHx8IFwKLQkJCQkJCSAoKElTX1NL TF9HVDMoZGV2KSB8fCBJU19TS0xfR1Q0KGRldikpICYmIFwKLQkJCQkJCSAgSVNfU0tMX1JFVklE KGRldiwgMCwgU0tMX1JFVklEX0YwKSkpCisJCQkJCQkgSVNfU0tMX0dUMyhkZXYpIHx8IFwKKwkJ CQkJCSBJU19TS0xfR1Q0KGRldikpCisKIC8qCiAgKiBkcCBhdXggYW5kIGdtYnVzIGlycSBvbiBn ZW40IHNlZW1zIHRvIGJlIGFibGUgdG8gZ2VuZXJhdGUgbGVnYWN5IGludGVycnVwdHMKICAqIGV2 ZW4gd2hlbiBpbiBNU0kgbW9kZS4gVGhpcyByZXN1bHRzIGluIHNwdXJpb3VzIGludGVycnVwdCB3 YXJuaW5ncyBpZiB0aGUKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK