drm/i915: always return something on DDI clock selection

lucasdemarchi · jnikula · commit 2a121030d4ee · 2019-02-05T15:25:27.000+02:00
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: 1fa11ee ("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 7a61a6d) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1086,7 +1086,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:

Original file line number	Diff line number	Diff line change
`@@ -1086,7 +1086,7 @@ static uint32_t icl_pll_to_ddi_pll_sel(struct intel_encoder *encoder,`
`1086`	`1086`	`return DDI_CLK_SEL_TBT_810;`
`1087`	`1087`	`default:`
`1088`	`1088`	`MISSING_CASE(clock);`
`1089`		`- break;`
	`1089`	`+ return DDI_CLK_SEL_NONE;`
`1090`	`1090`	`}`
`1091`	`1091`	`case DPLL_ID_ICL_MGPLL1:`
`1092`	`1092`	`case DPLL_ID_ICL_MGPLL2:`