drm/i915/dsb: Use DSB for plane/color management updates

Push regular plane/color management updates to the DSB,
if other constraints allow it.

The first part of the sequence will go as follows:
- CPU will kick off DSB0 immediately
- DSB0 writes double bufferd non-arming registers
- DSB0 evades the vblank
- DSB0 writes double buffered arming registers

If no color management updates is needed we follow that up with:
- DSB0 waits for the undelayed vblank
- DSB0 waits for the delayed vblank (usec wait)
- DSB0 emits an interrupt which will cause the CPU to complete the commit

If color management update is needed:
- DSB0 will start DSB1 with wait for undelayed vblank
- DSB0 will in parallel perform the force DEwake tricks
- DSB1 writes single buffered LUT registers
- DSB1 waits for the delayed vblank (usec wait)
- DSB1 emits an interrupt which will cause the CPU to complete the commit

With this sequence we don't need to increase the vblank delay
to make room for register programming during vblank, which is
a good thing for high refresh rate display. But I'll need to
still think of some way to eliminate VRR commit completion
related races under this scheme.

Stuff that isn't ready for DSB yet:
- modesets (potentially we could do
  at least the plane enabling via DSB)
- fastsets
- VRR
- PSR
- scalers
- async flips

Reviewed-by: Animesh Manna <animesh.manna@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930170415.23841-14-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 6cac26af128c72f0e6c851fdc3551632a8da26d2..03dc54c802d3b30a61008b2ff0405d29864ea9f0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -276,7 +276,8 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
        crtc_state->fb_bits = 0;
        crtc_state->update_planes = 0;
        crtc_state->dsb_color_vblank = NULL;
-       crtc_state->dsb_color_commit = NULL;
+       crtc_state->dsb_commit = NULL;
+       crtc_state->use_dsb = false;
 
        return &crtc_state->uapi;
 }
@@ -311,7 +312,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,
        struct intel_crtc_state *crtc_state = to_intel_crtc_state(state);
 
        drm_WARN_ON(crtc->dev, crtc_state->dsb_color_vblank);
-       drm_WARN_ON(crtc->dev, crtc_state->dsb_color_commit);
+       drm_WARN_ON(crtc->dev, crtc_state->dsb_commit);
 
        __drm_atomic_helper_crtc_destroy_state(&crtc_state->uapi);
        intel_crtc_free_hw_state(crtc_state);

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index 4df580019560a3e9cb6d7c393db67409f6624166..caf1af039960d60f0807107224eab178b4a43960 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -1913,9 +1913,6 @@ void intel_color_commit_arm(struct intel_dsb *dsb,
        struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev);
 
        i915->display.funcs.color->color_commit_arm(dsb, crtc_state);
-
-       if (crtc_state->dsb_color_commit)
-               intel_dsb_commit(crtc_state->dsb_color_commit, false);
 }
 
 void intel_color_post_update(const struct intel_crtc_state *crtc_state)
@@ -1966,28 +1963,14 @@ void intel_color_prepare_commit(struct intel_atomic_state *state,
 
        i915->display.funcs.color->load_luts(crtc_state);
 
-       intel_dsb_finish(crtc_state->dsb_color_vblank);
+       intel_dsb_wait_vblank_delay(state, crtc_state->dsb_color_vblank);
+       intel_dsb_interrupt(crtc_state->dsb_color_vblank);
 
-       crtc_state->dsb_color_commit = intel_dsb_prepare(state, crtc, INTEL_DSB_0, 16);
-       if (!crtc_state->dsb_color_commit) {
-               intel_dsb_cleanup(crtc_state->dsb_color_vblank);
-               crtc_state->dsb_color_vblank = NULL;
-               return;
-       }
-
-       intel_dsb_chain(state, crtc_state->dsb_color_commit,
-                       crtc_state->dsb_color_vblank, true);
-
-       intel_dsb_finish(crtc_state->dsb_color_commit);
+       intel_dsb_finish(crtc_state->dsb_color_vblank);
 }
 
 void intel_color_cleanup_commit(struct intel_crtc_state *crtc_state)
 {
-       if (crtc_state->dsb_color_commit) {
-               intel_dsb_cleanup(crtc_state->dsb_color_commit);
-               crtc_state->dsb_color_commit = NULL;
-       }
-
        if (crtc_state->dsb_color_vblank) {
                intel_dsb_cleanup(crtc_state->dsb_color_vblank);
                crtc_state->dsb_color_vblank = NULL;
@@ -1996,8 +1979,6 @@ void intel_color_cleanup_commit(struct intel_crtc_state *crtc_state)
 
 void intel_color_wait_commit(const struct intel_crtc_state *crtc_state)
 {
-       if (crtc_state->dsb_color_commit)
-               intel_dsb_wait(crtc_state->dsb_color_commit);
        if (crtc_state->dsb_color_vblank)
                intel_dsb_wait(crtc_state->dsb_color_vblank);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index 4c653e9076d5d75d410bf7c7c370cc347be158c6..3c9168a57f385a030868c329575e60c68b5d6783 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -416,10 +416,11 @@ int intel_crtc_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
 static bool intel_crtc_needs_vblank_work(const struct intel_crtc_state *crtc_state)
 {
        return crtc_state->hw.active &&
-               !intel_crtc_needs_modeset(crtc_state) &&
                !crtc_state->preload_luts &&
+               !intel_crtc_needs_modeset(crtc_state) &&
                intel_crtc_needs_color_update(crtc_state) &&
-               !intel_color_uses_dsb(crtc_state);
+               !intel_color_uses_dsb(crtc_state) &&
+               !crtc_state->use_dsb;
 }
 
 static void intel_crtc_vblank_work(struct kthread_work *base)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 10a30cfd0cd669288f73f36fbbcc6c1b02e19a91..f2b3b73c5432e3806fadf257f04701b6e122023f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7070,7 +7070,7 @@ static void commit_pipe_pre_planes(struct intel_atomic_state *state,
         * During modesets pipe configuration was programmed as the
         * CRTC was enabled.
         */
-       if (!modeset) {
+       if (!modeset && !new_crtc_state->use_dsb) {
                if (intel_crtc_needs_color_update(new_crtc_state))
                        intel_color_commit_arm(NULL, new_crtc_state);
 
@@ -7172,10 +7172,12 @@ static void intel_pre_update_crtc(struct intel_atomic_state *state,
        drm_WARN_ON(&i915->drm, !intel_display_power_is_enabled(i915, POWER_DOMAIN_DC_OFF));
 
        if (!modeset &&
-           intel_crtc_needs_color_update(new_crtc_state))
+           intel_crtc_needs_color_update(new_crtc_state) &&
+           !new_crtc_state->use_dsb)
                intel_color_commit_noarm(NULL, new_crtc_state);
 
-       intel_crtc_planes_update_noarm(NULL, state, crtc);
+       if (!new_crtc_state->use_dsb)
+               intel_crtc_planes_update_noarm(NULL, state, crtc);
 }
 
 static void intel_update_crtc(struct intel_atomic_state *state,
@@ -7186,16 +7188,25 @@ static void intel_update_crtc(struct intel_atomic_state *state,
        struct intel_crtc_state *new_crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
 
-       /* Perform vblank evasion around commit operation */
-       intel_pipe_update_start(state, crtc);
+       if (new_crtc_state->use_dsb) {
+               intel_crtc_prepare_vblank_event(new_crtc_state, &crtc->dsb_event);
+
+               intel_dsb_commit(new_crtc_state->dsb_commit, false);
+       } else {
+               /* Perform vblank evasion around commit operation */
+               intel_pipe_update_start(state, crtc);
+
+               if (new_crtc_state->dsb_commit)
+                       intel_dsb_commit(new_crtc_state->dsb_commit, false);
 
-       commit_pipe_pre_planes(state, crtc);
+               commit_pipe_pre_planes(state, crtc);
 
-       intel_crtc_planes_update_arm(NULL, state, crtc);
+               intel_crtc_planes_update_arm(NULL, state, crtc);
 
-       commit_pipe_post_planes(state, crtc);
+               commit_pipe_post_planes(state, crtc);
 
-       intel_pipe_update_end(state, crtc);
+               intel_pipe_update_end(state, crtc);
+       }
 
        /*
         * VRR/Seamless M/N update may need to update frame timings.
@@ -7520,6 +7531,24 @@ static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_stat
        }
 }
 
+static void intel_atomic_dsb_wait_commit(struct intel_crtc_state *crtc_state)
+{
+       if (crtc_state->dsb_commit)
+               intel_dsb_wait(crtc_state->dsb_commit);
+
+       intel_color_wait_commit(crtc_state);
+}
+
+static void intel_atomic_dsb_cleanup(struct intel_crtc_state *crtc_state)
+{
+       if (crtc_state->dsb_commit) {
+               intel_dsb_cleanup(crtc_state->dsb_commit);
+               crtc_state->dsb_commit = NULL;
+       }
+
+       intel_color_cleanup_commit(crtc_state);
+}
+
 static void intel_atomic_cleanup_work(struct work_struct *work)
 {
        struct intel_atomic_state *state =
@@ -7530,7 +7559,7 @@ static void intel_atomic_cleanup_work(struct work_struct *work)
        int i;
 
        for_each_old_intel_crtc_in_state(state, crtc, old_crtc_state, i)
-               intel_color_cleanup_commit(old_crtc_state);
+               intel_atomic_dsb_cleanup(old_crtc_state);
 
        drm_atomic_helper_cleanup_planes(&i915->drm, &state->base);
        drm_atomic_helper_commit_cleanup_done(&state->base);
@@ -7586,6 +7615,78 @@ static void intel_atomic_dsb_prepare(struct intel_atomic_state *state,
        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);
+       struct intel_crtc_state *new_crtc_state =
+               intel_atomic_get_new_crtc_state(state, crtc);
+
+       if (!new_crtc_state->hw.active)
+               return;
+
+       if (state->base.legacy_cursor_update)
+               return;
+
+       /* FIXME deal with everything */
+       new_crtc_state->use_dsb =
+               new_crtc_state->update_planes &&
+               !new_crtc_state->vrr.enable &&
+               !new_crtc_state->do_async_flip &&
+               !new_crtc_state->has_psr &&
+               !new_crtc_state->scaler_state.scaler_users &&
+               !old_crtc_state->scaler_state.scaler_users &&
+               !intel_crtc_needs_modeset(new_crtc_state) &&
+               !intel_crtc_needs_fastset(new_crtc_state);
+
+       if (!new_crtc_state->use_dsb && !new_crtc_state->dsb_color_vblank)
+               return;
+
+       /*
+        * Rough estimate:
+        * ~64 registers per each plane * 8 planes = 512
+        * Double that for pipe stuff and other overhead.
+        */
+       new_crtc_state->dsb_commit = intel_dsb_prepare(state, crtc, INTEL_DSB_0,
+                                                      new_crtc_state->use_dsb ? 1024 : 16);
+       if (!new_crtc_state->dsb_commit) {
+               new_crtc_state->use_dsb = false;
+               intel_color_cleanup_commit(new_crtc_state);
+               return;
+       }
+
+       if (new_crtc_state->use_dsb) {
+               if (intel_crtc_needs_color_update(new_crtc_state))
+                       intel_color_commit_noarm(new_crtc_state->dsb_commit,
+                                                new_crtc_state);
+               intel_crtc_planes_update_noarm(new_crtc_state->dsb_commit,
+                                              state, crtc);
+
+               intel_dsb_vblank_evade(state, new_crtc_state->dsb_commit);
+
+               if (intel_crtc_needs_color_update(new_crtc_state))
+                       intel_color_commit_arm(new_crtc_state->dsb_commit,
+                                              new_crtc_state);
+               bdw_set_pipe_misc(new_crtc_state->dsb_commit,
+                                 new_crtc_state);
+               intel_crtc_planes_update_arm(new_crtc_state->dsb_commit,
+                                            state, crtc);
+
+               if (!new_crtc_state->dsb_color_vblank) {
+                       intel_dsb_wait_vblanks(new_crtc_state->dsb_commit, 1);
+                       intel_dsb_wait_vblank_delay(state, new_crtc_state->dsb_commit);
+                       intel_dsb_interrupt(new_crtc_state->dsb_commit);
+               }
+       }
+
+       if (new_crtc_state->dsb_color_vblank)
+               intel_dsb_chain(state, new_crtc_state->dsb_commit,
+                               new_crtc_state->dsb_color_vblank, true);
+
+       intel_dsb_finish(new_crtc_state->dsb_commit);
+}
+
 static void intel_atomic_commit_tail(struct intel_atomic_state *state)
 {
        struct drm_device *dev = state->base.dev;
@@ -7605,6 +7706,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
 
        intel_atomic_prepare_plane_clear_colors(state);
 
+       for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
+               intel_atomic_dsb_finish(state, crtc);
+
        drm_atomic_helper_wait_for_dependencies(&state->base);
        drm_dp_mst_atomic_wait_for_dependencies(&state->base);
        intel_atomic_global_state_wait_for_dependencies(state);
@@ -7718,7 +7822,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
                if (new_crtc_state->do_async_flip)
                        intel_crtc_disable_flip_done(state, crtc);
 
-               intel_color_wait_commit(new_crtc_state);
+               intel_atomic_dsb_wait_commit(new_crtc_state);
        }
 
        /*
@@ -7763,7 +7867,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
                 * FIXME get rid of this funny new->old swapping
                 */
                old_crtc_state->dsb_color_vblank = fetch_and_zero(&new_crtc_state->dsb_color_vblank);
-               old_crtc_state->dsb_color_commit = fetch_and_zero(&new_crtc_state->dsb_color_commit);
+               old_crtc_state->dsb_commit = fetch_and_zero(&new_crtc_state->dsb_commit);
        }
 
        /* Underruns don't always raise interrupts, so check manually */

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 3902b25e7d24188b26fc08f8d3a1e3e049cda2d1..2bb1fa64da2f1a30be3140ed20b7a8aa53cfe4cf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1270,8 +1270,9 @@ struct intel_crtc_state {
        /* Only valid on TGL+ */
        enum transcoder mst_master_transcoder;
 
-       /* For DSB based color LUT updates */
-       struct intel_dsb *dsb_color_vblank, *dsb_color_commit;
+       /* For DSB based pipe updates */
+       struct intel_dsb *dsb_color_vblank, *dsb_commit;
+       bool use_dsb;
 
        u32 psr2_man_track_ctl;