summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ddi.c
diff options
context:
space:
mode:
authorLucas De Marchi2019-01-25 23:24:42 +0100
committerLucas De Marchi2019-01-29 23:35:04 +0100
commit7a61a6dec3dfb9f2e8c39a337580a3c3036c5cdf (patch)
tree5bf5d5fef6add903ecd85c10513e60e1ab663049 /drivers/gpu/drm/i915/intel_ddi.c
parentdrm/i915/icl: use tc_port in MG_PLL macros (diff)
downloadkernel-qcow2-linux-7a61a6dec3dfb9f2e8c39a337580a3c3036c5cdf.tar.gz
kernel-qcow2-linux-7a61a6dec3dfb9f2e8c39a337580a3c3036c5cdf.tar.xz
kernel-qcow2-linux-7a61a6dec3dfb9f2e8c39a337580a3c3036c5cdf.zip
drm/i915: always return something on DDI clock selection
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index ae2413ec2196..51d4be072268 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1021,7 +1021,7 @@ static u32 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: