drm/i915/dsb: Compute use_dsb earlier

Skip all the commit completion interrupt stuff on the
chained DSB when we don't take the full DSB path (ie. when
the plane/pipe programming is done via MMIO). The commit
completion will be done via the CPU side vblank interrupt.

Currently this is just a redundant interrupt, so not a big
deal. But in the future we'll be moving the TRANS_PUSH write
into the chained DSB as well, and that we definitely don't
want to do when it's also being done by the CPU from
intel_pipe_update_end().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250207223159.14132-5-ville.syrjala@linux.intel.com
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index 8400a97f7e43472e5022b2126fd542cc19fabbd5..792cf7cef58a75b67e137c24958b702c50c9e27b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -1987,8 +1987,10 @@ void intel_color_prepare_commit(struct intel_atomic_state *state,
 
        display->funcs.color->load_luts(crtc_state);
 
-       intel_dsb_wait_vblank_delay(state, crtc_state->dsb_color_vblank);
-       intel_dsb_interrupt(crtc_state->dsb_color_vblank);
+       if (crtc_state->use_dsb) {
+               intel_dsb_wait_vblank_delay(state, crtc_state->dsb_color_vblank);
+               intel_dsb_interrupt(crtc_state->dsb_color_vblank);
+       }
 
        intel_dsb_finish(crtc_state->dsb_color_vblank);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 9557fa4bb89e15749f08e343aba6c57f87bbc535..7bb33b845e8cc38e08e15a39b3dc242f9a9ad257 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7687,12 +7687,6 @@ static void intel_atomic_prepare_plane_clear_colors(struct intel_atomic_state *s
 
 static void intel_atomic_dsb_prepare(struct intel_atomic_state *state,
                                     struct intel_crtc *crtc)
-{
-       intel_color_prepare_commit(state, crtc);
-}
-
-static void intel_atomic_dsb_finish(struct intel_atomic_state *state,
-                                   struct intel_crtc *crtc)
 {
        const struct intel_crtc_state *old_crtc_state =
                intel_atomic_get_old_crtc_state(state, crtc);
@@ -7715,6 +7709,15 @@ static void intel_atomic_dsb_finish(struct intel_atomic_state *state,
                !intel_crtc_needs_modeset(new_crtc_state) &&
                !intel_crtc_needs_fastset(new_crtc_state);
 
+       intel_color_prepare_commit(state, crtc);
+}
+
+static void intel_atomic_dsb_finish(struct intel_atomic_state *state,
+                                   struct intel_crtc *crtc)
+{
+       struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
+
        if (!new_crtc_state->use_dsb && !new_crtc_state->dsb_color_vblank)
                return;