leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Flatten hsw_crtc_compute_clock()

Browse Source 
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@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210913144440.23008-5-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä
2021-09-13 17:44:28 +03:00
parent e0ccf1d6f1
commit 555ec52127
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/display/intel_dpll.c
View File

@@ -937,17 +937,19 @@ static int hsw_crtc_compute_clock(struct intel_crtc_state *crtc_state)
struct intel_encoder *encoder = struct intel_encoder *encoder =
intel_get_crtc_new_encoder(state, crtc_state); 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); 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 (DISPLAY_VER(dev_priv) < 11 &&
intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI))
return 0;
if (!intel_reserve_shared_dplls(state, crtc, encoder)) { if (!intel_reserve_shared_dplls(state, crtc, encoder)) {
drm_dbg_kms(&dev_priv->drm, drm_dbg_kms(&dev_priv->drm,
"failed to find PLL for pipe %c\n", "failed to find PLL for pipe %c\n",
pipe_name(crtc->pipe)); pipe_name(crtc->pipe));
return -EINVAL; return -EINVAL;
} }
}
return 0; return 0;
} }