FROMLIST: drm: skip wait on vblank for set plane

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
(am from https://github.com/LongChair/LibreELEC.tv/commit/debdec6)

Change-Id: I20d3d03638388fbb1e84215cba187f2e89089a62
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index b8ece3ac54aebec13cf78b650c9affef08fab6cf..ccd713baa86cdb4bbd8a2be6ba91b9d94c2c6f96 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1520,8 +1520,7 @@ retry:
        plane_state->src_h = src_h;
        plane_state->src_w = src_w;
 
-       if (plane == crtc->cursor)
-               state->legacy_cursor_update = true;
+       state->legacy_cursor_update = true;
 
        ret = drm_atomic_commit(state);
        if (ret != 0)
@@ -1589,8 +1588,7 @@ retry:
                goto fail;
        }
 
-       if (plane_state->crtc && (plane == plane->crtc->cursor))
-               plane_state->state->legacy_cursor_update = true;
+       plane_state->state->legacy_cursor_update = true;
 
        ret = __drm_atomic_helper_disable_plane(plane, plane_state);
        if (ret != 0)