From: Jonas Karlman Date: Tue, 2 May 2017 05:53:15 +0000 (+0200) Subject: FROMLIST: drm: skip wait on vblank for set plane X-Git-Tag: release-20171130_firefly~4^2~173 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecac2033831e2e6b08d30d705dce7a4bb1926885;p=firefly-linux-kernel-4.4.55.git FROMLIST: drm: skip wait on vblank for set plane Signed-off-by: Jonas Karlman (am from https://github.com/LongChair/LibreELEC.tv/commit/debdec6) Change-Id: I20d3d03638388fbb1e84215cba187f2e89089a62 Signed-off-by: Mark Yao --- diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index b8ece3ac54ae..ccd713baa86c 100644 --- 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)