Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-01-18 12:53:06 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-01-18 17:08:08 +0100
commitd9d6b3a86ca47dc12ade84b62937d3fb752cba65 (patch)
treec4f7955120f4062847f4027310d822a8f9bc6da0
parent1b233d0e54cbf3ac7d45b4175933a1c4010702f3 (diff)
drm/i915/icl: Fix power well 2 wrt. DC-off toggling order (bsc#1113956)
-rw-r--r--patches.drm/0001-drm-i915-icl-Fix-power-well-2-wrt.-DC-off-toggling-o.patch55
-rw-r--r--series.conf1
2 files changed, 56 insertions, 0 deletions
diff --git a/patches.drm/0001-drm-i915-icl-Fix-power-well-2-wrt.-DC-off-toggling-o.patch b/patches.drm/0001-drm-i915-icl-Fix-power-well-2-wrt.-DC-off-toggling-o.patch
new file mode 100644
index 0000000000..a216b77eab
--- /dev/null
+++ b/patches.drm/0001-drm-i915-icl-Fix-power-well-2-wrt.-DC-off-toggling-o.patch
@@ -0,0 +1,55 @@
+From a33e1ece777996ddddb1f23a30f8c66422ed0b68 Mon Sep 17 00:00:00 2001
+From: Imre Deak <imre.deak@intel.com>
+Date: Fri, 2 Nov 2018 20:22:00 +0200
+Subject: drm/i915/icl: Fix power well 2 wrt. DC-off toggling order
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Git-commit: a33e1ece777996ddddb1f23a30f8c66422ed0b68
+Patch-mainline: v5.0-rc1
+References: bsc#1113956
+
+To enable DC5/6 power well 2 has to be disabled as for previous
+platforms, so fix things up.
+
+Bspec: 4234
+Fixes: 67ca07e7ac10 ("drm/i915/icl: Add power well support")
+Cc: Animesh Manna <animesh.manna@intel.com>
+Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Signed-off-by: Imre Deak <imre.deak@intel.com>
+Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20181102182200.17219-1-imre.deak@intel.com
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
++++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
+@@ -2623,6 +2623,12 @@ static struct i915_power_well icl_power_
+ .hsw.has_fuses = true,
+ },
+ {
++ .name = "DC off",
++ .domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS,
++ .ops = &gen9_dc_off_power_well_ops,
++ .id = SKL_DISP_PW_DC_OFF,
++ },
++ {
+ .name = "power well 2",
+ .domains = ICL_PW_2_POWER_DOMAINS,
+ .ops = &hsw_power_well_ops,
+@@ -2630,12 +2636,6 @@ static struct i915_power_well icl_power_
+ .hsw.has_fuses = true,
+ },
+ {
+- .name = "DC off",
+- .domains = ICL_DISPLAY_DC_OFF_POWER_DOMAINS,
+- .ops = &gen9_dc_off_power_well_ops,
+- .id = SKL_DISP_PW_DC_OFF,
+- },
+- {
+ .name = "power well 3",
+ .domains = ICL_PW_3_POWER_DOMAINS,
+ .ops = &hsw_power_well_ops,
diff --git a/series.conf b/series.conf
index 04b1eff39d..51c1cc39b8 100644
--- a/series.conf
+++ b/series.conf
@@ -42101,6 +42101,7 @@
patches.drm/0062-drm-i915-Fix-error-handling-for-the-NV12-fb-dimensio.patch
patches.drm/0063-drm-i915-icl-Fix-the-macros-for-DFLEXDPMLE-register-.patch
patches.drivers/ALSA-x86-Fix-runtime-PM-for-hdmi-lpe-audio.patch
+ patches.drm/0001-drm-i915-icl-Fix-power-well-2-wrt.-DC-off-toggling-o.patch
patches.drm/0071-drm-i915-Fix-hpd-handling-for-pins-with-two-encoders.patch
patches.drm/0074-drm-i915-fix-broadwell-EU-computation.patch
patches.drm/0076-drm-i915-icl-Drop-spurious-register-read-from-icl_db.patch