On Tue, 03 May 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> No sense in calling intel_modeset_pipe_config_late() for a disabled
> pipe.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 11e974d66c29..a81d866bdb19 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -7669,9 +7669,11 @@ static int intel_atomic_check(struct drm_device *dev,
> if (!intel_crtc_needs_modeset(new_crtc_state))
> continue;
>
> - ret = intel_modeset_pipe_config_late(state, crtc);
> - if (ret)
> - goto fail;
> + if (new_crtc_state->hw.enable) {
> + ret = intel_modeset_pipe_config_late(state, crtc);
> + if (ret)
> + goto fail;
> + }
>
> intel_crtc_check_fastset(old_crtc_state, new_crtc_state);
> }
--
Jani Nikula, Intel Open Source Graphics Center
