drm/i915: Skip intel_modeset_pipe_config_late() if the pipe is not enabled

No sense in calling intel_modeset_pipe_config_late() for a disabled
pipe.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220907091057.11572-14-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 976af608b1d65498752276a481323be9950998f5..765ec3102cfe909c15cba1da7eb2519d719ff5a9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6783,9 +6783,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);
        }