On Mon, 13 Sep 2021, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> hsw_crtc_compute_clock() has become spaghetti. Flatten
> it a bit to make it at least semi-legible.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_dpll.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c
> index 210f91f4a576..ace9157a1c30 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpll.c
> @@ -937,16 +937,18 @@ static int hsw_crtc_compute_clock(struct intel_crtc_state *crtc_state)
> struct intel_encoder *encoder =
> intel_get_crtc_new_encoder(state, crtc_state);
>
> - if (IS_DG2(dev_priv)) {
> + if (IS_DG2(dev_priv))
> return intel_mpllb_calc_state(crtc_state, encoder);
> - } else if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI) ||
> - DISPLAY_VER(dev_priv) >= 11) {
> - if (!intel_reserve_shared_dplls(state, crtc, encoder)) {
> - drm_dbg_kms(&dev_priv->drm,
> - "failed to find PLL for pipe %c\n",
> - pipe_name(crtc->pipe));
> - return -EINVAL;
> - }
> +
> + if (DISPLAY_VER(dev_priv) < 11 &&
> + intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI))
> + return 0;
> +
> + if (!intel_reserve_shared_dplls(state, crtc, encoder)) {
> + drm_dbg_kms(&dev_priv->drm,
> + "failed to find PLL for pipe %c\n",
> + pipe_name(crtc->pipe));
> + return -EINVAL;
> }
>
> return 0;
--
Jani Nikula, Intel Open Source Graphics Center
