Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-01-10 16:18:43 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2019-01-17 15:28:26 +0100
commiteaa43e8c184cba1fb8adf7f78da479b075210e40 (patch)
treec09917078bb630d91f4880ca0aa984e43856c41b
parentbfb4810c4c5a30363c4517c5501cab6c9eff51e7 (diff)
drm/i915: fix broadwell EU computation (bsc#1113956)
-rw-r--r--patches.drm/0074-drm-i915-fix-broadwell-EU-computation.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.drm/0074-drm-i915-fix-broadwell-EU-computation.patch b/patches.drm/0074-drm-i915-fix-broadwell-EU-computation.patch
new file mode 100644
index 0000000000..6b7bf8d62c
--- /dev/null
+++ b/patches.drm/0074-drm-i915-fix-broadwell-EU-computation.patch
@@ -0,0 +1,37 @@
+From 63ac3328f0d1d37f286e397b14d9596ed09d7ca5 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Date: Mon, 12 Nov 2018 12:39:31 +0000
+Subject: drm/i915: fix broadwell EU computation
+Git-commit: 63ac3328f0d1d37f286e397b14d9596ed09d7ca5
+Patch-mainline: v5.0-rc1
+References: bsc#1113956
+
+subslice_mask is an array indexed by slice, not subslice.
+
+Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Fixes: 8cc7669355136f ("drm/i915: store all subslice masks")
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108712
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20181112123931.2815-1-lionel.g.landwerlin@intel.com
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/i915/intel_device_info.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
+index 89ed3a84a4fa..ceecb5bd5226 100644
+--- a/drivers/gpu/drm/i915/intel_device_info.c
++++ b/drivers/gpu/drm/i915/intel_device_info.c
+@@ -474,7 +474,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv)
+ u8 eu_disabled_mask;
+ u32 n_disabled;
+
+- if (!(sseu->subslice_mask[ss] & BIT(ss)))
++ if (!(sseu->subslice_mask[s] & BIT(ss)))
+ /* skip disabled subslice */
+ continue;
+
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 8aca53ff9d..267faaa73e 100644
--- a/series.conf
+++ b/series.conf
@@ -42099,6 +42099,7 @@
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/0071-drm-i915-Fix-hpd-handling-for-pins-with-two-encoders.patch
+ patches.drm/0074-drm-i915-fix-broadwell-EU-computation.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