Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-01-10 16:19:48 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-01-17 15:28:27 +0100
commit61fa2ce5f36bab8ef07c0fdc43965c6714abc172 (patch)
tree33396f775a856a09f3a91f61b8a879a54a663985
parenteaa43e8c184cba1fb8adf7f78da479b075210e40 (diff)
drm/i915/icl: Drop spurious register read from icl_dbuf_slices_update (bsc#1113956)
-rw-r--r--patches.drm/0076-drm-i915-icl-Drop-spurious-register-read-from-icl_db.patch48
-rw-r--r--series.conf1
2 files changed, 49 insertions, 0 deletions
diff --git a/patches.drm/0076-drm-i915-icl-Drop-spurious-register-read-from-icl_db.patch b/patches.drm/0076-drm-i915-icl-Drop-spurious-register-read-from-icl_db.patch
new file mode 100644
index 0000000000..48ac08c36a
--- /dev/null
+++ b/patches.drm/0076-drm-i915-icl-Drop-spurious-register-read-from-icl_db.patch
@@ -0,0 +1,48 @@
+From 8577c319b6511fbc391f3775225fecd8b979bc26 Mon Sep 17 00:00:00 2001
+From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
+Date: Fri, 9 Nov 2018 16:09:23 +0200
+Subject: drm/i915/icl: Drop spurious register read from icl_dbuf_slices_update
+Git-commit: 8577c319b6511fbc391f3775225fecd8b979bc26
+Patch-mainline: v5.0-rc1
+References: bsc#1113956
+
+Register DBUF_CTL_S2 is read and it's value is not used. As
+there is no explanation why we should prime the hardware with
+read, remove it as spurious.
+
+Fixes: aa9664ffe863 ("drm/i915/icl: Enable 2nd DBuf slice only when needed")
+Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
+Reviewed-by: Imre Deak <imre.deak@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20181109140924.2663-1-mika.kuoppala@linux.intel.com
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
+index f945db6ea420..770de2632530 100644
+--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
++++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
+@@ -3236,8 +3236,7 @@ static u8 intel_dbuf_max_slices(struct drm_i915_private *dev_priv)
+ void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,
+ u8 req_slices)
+ {
+- u8 hw_enabled_slices = dev_priv->wm.skl_hw.ddb.enabled_slices;
+- u32 val;
++ const u8 hw_enabled_slices = dev_priv->wm.skl_hw.ddb.enabled_slices;
+ bool ret;
+
+ if (req_slices > intel_dbuf_max_slices(dev_priv)) {
+@@ -3248,7 +3247,6 @@ void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,
+ if (req_slices == hw_enabled_slices || req_slices == 0)
+ return;
+
+- val = I915_READ(DBUF_CTL_S2);
+ if (req_slices > hw_enabled_slices)
+ ret = intel_dbuf_slice_set(dev_priv, DBUF_CTL_S2, true);
+ else
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 267faaa73e..393022fe0e 100644
--- a/series.conf
+++ b/series.conf
@@ -42100,6 +42100,7 @@
patches.drivers/ALSA-x86-Fix-runtime-PM-for-hdmi-lpe-audio.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
patches.drm/0001-drm-rcar-du-Fix-vblank-initialization.patch
patches.drm/0001-drm-rcar-du-Fix-external-clock-error-checks.patch
patches.drivers/ALSA-usb-audio-Define-registers-for-CM6206.patch