Commit 318bd821 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter

drm/i915/skl: Propagate the error if we fail to find a suitable DPLL divider

At the moment, even if we fail to find a suitable divider, we'll still
try to set the mode with bogus parameters.

Just fail the modeset if we can't generate the frequency.
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 19cdc0e6
...@@ -1115,7 +1115,7 @@ struct skl_wrpll_params { ...@@ -1115,7 +1115,7 @@ struct skl_wrpll_params {
uint32_t central_freq; uint32_t central_freq;
}; };
static void static bool
skl_ddi_calculate_wrpll(int clock /* in Hz */, skl_ddi_calculate_wrpll(int clock /* in Hz */,
struct skl_wrpll_params *wrpll_params) struct skl_wrpll_params *wrpll_params)
{ {
...@@ -1196,6 +1196,7 @@ skl_ddi_calculate_wrpll(int clock /* in Hz */, ...@@ -1196,6 +1196,7 @@ skl_ddi_calculate_wrpll(int clock /* in Hz */,
if (min_dco_index > 2) { if (min_dco_index > 2) {
WARN(1, "No valid parameters found for pixel clock: %dHz\n", WARN(1, "No valid parameters found for pixel clock: %dHz\n",
clock); clock);
return false;
} else { } else {
wrpll_params->central_freq = dco_central_freq[min_dco_index]; wrpll_params->central_freq = dco_central_freq[min_dco_index];
...@@ -1262,6 +1263,8 @@ skl_ddi_calculate_wrpll(int clock /* in Hz */, ...@@ -1262,6 +1263,8 @@ skl_ddi_calculate_wrpll(int clock /* in Hz */,
wrpll_params->dco_integer * MHz(1)) * 0x8000), MHz(1)); wrpll_params->dco_integer * MHz(1)) * 0x8000), MHz(1));
} }
return true;
} }
...@@ -1286,7 +1289,8 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc, ...@@ -1286,7 +1289,8 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,
ctrl1 |= DPLL_CTRL1_HDMI_MODE(0); ctrl1 |= DPLL_CTRL1_HDMI_MODE(0);
skl_ddi_calculate_wrpll(clock * 1000, &wrpll_params); if (!skl_ddi_calculate_wrpll(clock * 1000, &wrpll_params))
return false;
cfgcr1 = DPLL_CFGCR1_FREQ_ENABLE | cfgcr1 = DPLL_CFGCR1_FREQ_ENABLE |
DPLL_CFGCR1_DCO_FRACTION(wrpll_params.dco_fraction) | DPLL_CFGCR1_DCO_FRACTION(wrpll_params.dco_fraction) |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment