[Intel-gfx] [PATCH 2/2] drm/i915: Handle legacy cursor update as normal update

[Maarten Lankhorst]

Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c      | 15 ++++++++++++++-
 .../gpu/drm/i915/display/intel_display_types.h    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 43bcd3d011bf5..3927dfb894c1a 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6864,6 +6864,9 @@ static void intel_atomic_cleanup_work(struct work_struct 
*work)
        struct intel_crtc *crtc;
        int i;
 
+       if (state->cursor_update)
+               drm_atomic_helper_wait_for_flip_done(dev, &state->base);
+
        for_each_old_intel_crtc_in_state(state, crtc, old_crtc_state, i)
                intel_color_cleanup_commit(old_crtc_state);
 
@@ -7062,7 +7065,8 @@ static void intel_atomic_commit_tail(struct 
intel_atomic_state *state)
         * - switch over to the vblank wait helper in the core after that since
         *   we don't need out special handling any more.
         */
-       drm_atomic_helper_wait_for_flip_done(dev, &state->base);
+       if (!state->cursor_update)
+               drm_atomic_helper_wait_for_flip_done(dev, &state->base);
 
        for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) {
                if (new_crtc_state->do_async_flip)
@@ -7247,6 +7251,15 @@ int intel_atomic_commit(struct drm_device *dev, struct 
drm_atomic_state *_state,
                                state->base.legacy_cursor_update = false;
        }
 
+       if (state->base.legacy_cursor_update) {
+               /*
+                * If this is a legacy cursor update, handle like a normal 
update,
+                * but wait before calling cleanup
+                */
+               state->base.legacy_cursor_update = false;
+               state->cursor_update = true;
+       }
+
        ret = intel_atomic_prepare_commit(state);
        if (ret) {
                drm_dbg_atomic(&dev_priv->drm,
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h 
b/drivers/gpu/drm/i915/display/intel_display_types.h
index c85cf8adc7a69..01f7c8d24179c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -646,7 +646,7 @@ struct intel_atomic_state {
        /* Internal commit, as opposed to userspace/client initiated one */
        bool internal;
 
-       bool dpll_set, modeset;
+       bool dpll_set, modeset, cursor_update;
 
        struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS];
 
-- 
2.39.2