From: Ville Syrjälä <ville.syrj...@linux.intel.com>

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

Reviewed-by: Jani Nikula <jani.nik...@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 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 16a4ea183746..4f7e119f1cd3 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6918,9 +6918,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);
        }
-- 
2.35.1

Reply via email to