Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:12 +0100
commitbc0debcf04a238d53343668dc267fee5c62382d4 (patch)
treeb005c698db34ef4a25838cda05984d6a2b1fe465
parentc58854f7a351daec4e1598320432271fb2b069ce (diff)
drm/i915: always return something on DDI clock selection
-rw-r--r--patches.kernel.org/4.20.9-040-drm-i915-always-return-something-on-DDI-clock-.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-040-drm-i915-always-return-something-on-DDI-clock-.patch b/patches.kernel.org/4.20.9-040-drm-i915-always-return-something-on-DDI-clock-.patch
new file mode 100644
index 0000000000..0eaa1356c2
--- /dev/null
+++ b/patches.kernel.org/4.20.9-040-drm-i915-always-return-something-on-DDI-clock-.patch
@@ -0,0 +1,45 @@
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Fri, 25 Jan 2019 14:24:42 -0800
+Subject: [PATCH] drm/i915: always return something on DDI clock selection
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: 2a121030d4ee3f84f60c6f415f9c44bffbcde81d
+Git-commit: 7a61a6dec3dfb9f2e8c39a337580a3c3036c5cdf
+
+commit 2a121030d4ee3f84f60c6f415f9c44bffbcde81d upstream.
+
+Even if we don't have the correct clock and get a warning, we should not
+skip the return.
+
+v2: improve commit message (from Joonas)
+
+Fixes: 1fa11ee2d9d0 ("drm/i915/icl: start adding the TBT pll")
+Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Cc: <stable@vger.kernel.org> # v4.19+
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Reviewed-by: Mika Kahola <mika.kahola@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190125222444.19926-3-lucas.demarchi@intel.com
+(cherry picked from commit 7a61a6dec3dfb9f2e8c39a337580a3c3036c5cdf)
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/gpu/drm/i915/intel_ddi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
+index 5186cd7075f9..372f30d286e3 100644
+--- a/drivers/gpu/drm/i915/intel_ddi.c
++++ b/drivers/gpu/drm/i915/intel_ddi.c
+@@ -1085,7 +1085,7 @@ static uint32_t icl_pll_to_ddi_pll_sel(struct intel_encoder *encoder,
+ return DDI_CLK_SEL_TBT_810;
+ default:
+ MISSING_CASE(clock);
+- break;
++ return DDI_CLK_SEL_NONE;
+ }
+ case DPLL_ID_ICL_MGPLL1:
+ case DPLL_ID_ICL_MGPLL2:
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index d1edaecc0b..47346510b3 100644
--- a/series.conf
+++ b/series.conf
@@ -1122,6 +1122,7 @@
patches.kernel.org/4.20.9-037-drm-modes-Prevent-division-by-zero-htotal.patch
patches.kernel.org/4.20.9-038-drm-rockchip-rgb-update-SPDX-license-identifie.patch
patches.kernel.org/4.20.9-039-drm-amd-powerplay-Fix-missing-break-in-switch.patch
+ patches.kernel.org/4.20.9-040-drm-i915-always-return-something-on-DDI-clock-.patch
########################################################
# Build fixes that apply to the vanilla kernel too.