diff mbox

[2/2] UBUNTU: SAUCE: i915_bpo: Disable RC6 on SKL GT3 & GT4

Message ID 1459504699-19285-3-git-send-email-tjaalton@ubuntu.com
State New
Headers show

Commit Message

Timo Aaltonen April 1, 2016, 9:58 a.m. UTC 
From: Timo Aaltonen <timo.aaltonen@canonical.com>

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

Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
---
 ubuntu/i915/intel_pm.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Timo Aaltonen April 1, 2016, 12:37 p.m. UTC | #1 
Turns out this might get fixed upstream before kernel freeze, so I'll
keep on testing what Intel throws at us while there's still time.
Timo Aaltonen April 6, 2016, 1:13 p.m. UTC | #2 
01.04.2016, 15:37, Timo Aaltonen kirjoitti:
> 
> Turns out this might get fixed upstream before kernel freeze, so I'll
> keep on testing what Intel throws at us while there's still time.

Patch 1/2 is stil ok to apply, but for the other one I'll send another
two-patch series which replaces 2/2.
Timo Aaltonen April 6, 2016, 1:20 p.m. UTC | #3 
These replace patch 2/2 from the old series for
http://bugs.launchpad.net/bugs/1564759


Mika Kuoppala (2):
  UBUNTU: SAUCE: i915_bpo: drm/i915/skl: Fix rc6 based gpu/system hang
  UBUNTU: SAUCE: i915_bpo: drm/i915/skl: Fix spurious gpu hang with
    gt3/gt4 revs

 ubuntu/i915/i915_drv.h         | 5 +++--
 ubuntu/i915/intel_ringbuffer.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
Tim Gardner April 6, 2016, 1:28 p.m. UTC | #4
diff mbox

Patch

diff --git a/ubuntu/i915/intel_pm.c b/ubuntu/i915/intel_pm.c
index 40c36e5..01289e8 100644
--- a/ubuntu/i915/intel_pm.c
+++ b/ubuntu/i915/intel_pm.c
@@ -4620,6 +4620,11 @@  int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6)
 	if (!enable_rc6)
 		return 0;
 
+	if (IS_SKL_GT3(dev) || IS_SKL_GT4(dev)) {
+		DRM_INFO("RC6 disabled on SKL GT3 & GT4, LP: #1564759\n");
+		return 0;
+	}
+
 	if (IS_BROXTON(dev) && !bxt_check_bios_rc6_setup(dev)) {
 		DRM_INFO("RC6 disabled by BIOS\n");
 		return 0;