[PATCH 1/2] UBUNTU: SAUCE: i915_bpo: drm/i915/skl: Fix rc6 based gpu/system hang

[Timo Aaltonen]

From: Mika Kuoppala <mika.kuoppala at linux.intel.com>

BugLink: http://bugs.launchpad.net/bugs/1564759

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 <abdiel.janulgue at linux.intel.com>
Cc: Ben Widawsky <benjamin.widawsky at intel.com>
Cc: Timo Aaltonen <tjaalton at ubuntu.com>
Cc: <stable at vger.kernel.org>
Reported-by: Mikael Djurfeldt <mikael at djurfeldt.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=94161
Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>
(pulled from stable@ list)
Signed-off-by: Timo Aaltonen <timo.aaltonen at canonical.com>
---
 ubuntu/i915/i915_drv.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ubuntu/i915/i915_drv.h b/ubuntu/i915/i915_drv.h
index e26c577..ebb45fb 100644
--- a/ubuntu/i915/i915_drv.h
+++ b/ubuntu/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.7.4