Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2a354ce authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Greg Kroah-Hartman
Browse files

drm/i915: always return something on DDI clock selection 



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: 1fa11ee2 ("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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMika 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: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b81afe37

drivers/gpu/drm/i915/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -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: