From: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Date: Fri, 12 Oct 2018 09:46:38 +0000 (+0200)
Subject: drm/sti: make crct disable atomic
X-Git-Tag: for-linus-20190104~57^2~20^2~114
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=885054f9917ef459c885926e2c130e80d5326faa;p=linux-2.6-block.git

drm/sti: make crct disable atomic

Wait until the next vblank to be sure that crtc has been disabled.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20181012094639.1585-1-benjamin.gaignard@linaro.org
---

diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c
index 5824e6aca8f4..61c2379fba87 100644
--- a/drivers/gpu/drm/sti/sti_crtc.c
+++ b/drivers/gpu/drm/sti/sti_crtc.c
@@ -40,6 +40,8 @@ static void sti_crtc_atomic_disable(struct drm_crtc *crtc,
 	DRM_DEBUG_DRIVER("\n");
 
 	mixer->status = STI_MIXER_DISABLING;
+
+	drm_crtc_wait_one_vblank(crtc);
 }
 
 static int