From: Greg Kroah-Hartman Date: Thu, 7 May 2020 16:07:14 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.4.223~37 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9bb67e60974067f09baef3a944a9c2c83358bc1b;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: drm-i915-extend-wadisabledarbfclkgating-to-icl-ehl-tgl.patch --- diff --git a/queue-5.4/drm-i915-extend-wadisabledarbfclkgating-to-icl-ehl-tgl.patch b/queue-5.4/drm-i915-extend-wadisabledarbfclkgating-to-icl-ehl-tgl.patch new file mode 100644 index 00000000000..0ff3f57adc1 --- /dev/null +++ b/queue-5.4/drm-i915-extend-wadisabledarbfclkgating-to-icl-ehl-tgl.patch @@ -0,0 +1,45 @@ +From 1e1a139d62d1c11e3083c8638d31a9744bec3918 Mon Sep 17 00:00:00 2001 +From: Matt Roper +Date: Mon, 23 Dec 2019 17:20:24 -0800 +Subject: drm/i915: Extend WaDisableDARBFClkGating to icl,ehl,tgl + +From: Matt Roper + +commit 1e1a139d62d1c11e3083c8638d31a9744bec3918 upstream. + +WaDisableDARBFClkGating, now known as Wa_14010480278, has been added to +the workaround tables for ICL, EHL, and TGL so we need to extend our +platform test accordingly. + +Bspec: 33450 +Bspec: 33451 +Bspec: 52890 +Cc: stable@kernel.vger.org +Cc: Lucas De Marchi +Cc: Matt Atwood +Cc: Radhakrishna Sripada +Signed-off-by: Matt Roper +Link: https://patchwork.freedesktop.org/patch/msgid/20191224012026.3157766-2-matthew.d.roper@intel.com +Reviewed-by: Lucas De Marchi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/display/intel_display.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/i915/display/intel_display.c ++++ b/drivers/gpu/drm/i915/display/intel_display.c +@@ -16860,8 +16860,11 @@ get_encoder_power_domains(struct drm_i91 + + static void intel_early_display_was(struct drm_i915_private *dev_priv) + { +- /* Display WA #1185 WaDisableDARBFClkGating:cnl,glk */ +- if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) ++ /* ++ * Display WA #1185 WaDisableDARBFClkGating:cnl,glk,icl,ehl,tgl ++ * Also known as Wa_14010480278. ++ */ ++ if (IS_GEN_RANGE(dev_priv, 10, 12) || IS_GEMINILAKE(dev_priv)) + I915_WRITE(GEN9_CLKGATE_DIS_0, I915_READ(GEN9_CLKGATE_DIS_0) | + DARBF_GATING_DIS); + diff --git a/queue-5.4/series b/queue-5.4/series index bbfca59b050..ee22ab6027d 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -27,3 +27,4 @@ lib-mpi-fix-building-for-powerpc-with-clang.patch mac80211-sta_info-add-lockdep-condition-for-rcu-list.patch net-bcmgenet-suppress-warnings-on-failed-rx-skb-allo.patch net-systemport-suppress-warnings-on-failed-rx-skb-al.patch +drm-i915-extend-wadisabledarbfclkgating-to-icl-ehl-tgl.patch