aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Gaignard <benjamin.gaignard@linaro.org>2014-12-04 05:27:45 -0500
committerBenjamin Gaignard <benjamin.gaignard@linaro.org>2014-12-11 07:59:36 -0500
commitca614aadd7567ff074f185f3ac5f6a67466010b7 (patch)
tree09be129f6eef1776464c8e186ee25d490393f1d1
parent589b347b54932b2cd2f50845166c95f3981aa7db (diff)
drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off}
Make sure that vblank is enabled when crtc commit is call. Replace drm_vblank_off() by drm_crtc_vblank_off() Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
-rw-r--r--drivers/gpu/drm/sti/sti_drm_crtc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c
index 19e20fcf9f0d..534cd2c810ec 100644
--- a/drivers/gpu/drm/sti/sti_drm_crtc.c
+++ b/drivers/gpu/drm/sti/sti_drm_crtc.c
@@ -64,6 +64,8 @@ static void sti_drm_crtc_commit(struct drm_crtc *crtc)
64 /* Enable layer on mixer */ 64 /* Enable layer on mixer */
65 if (sti_mixer_set_layer_status(mixer, layer, true)) 65 if (sti_mixer_set_layer_status(mixer, layer, true))
66 DRM_ERROR("Can not enable layer at mixer\n"); 66 DRM_ERROR("Can not enable layer at mixer\n");
67
68 drm_crtc_vblank_on(crtc);
67} 69}
68 70
69static bool sti_drm_crtc_mode_fixup(struct drm_crtc *crtc, 71static bool sti_drm_crtc_mode_fixup(struct drm_crtc *crtc,
@@ -224,7 +226,7 @@ static void sti_drm_crtc_disable(struct drm_crtc *crtc)
224 /* Then disable layer itself */ 226 /* Then disable layer itself */
225 sti_layer_disable(layer); 227 sti_layer_disable(layer);
226 228
227 drm_vblank_off(crtc->dev, mixer->id); 229 drm_crtc_vblank_off(crtc);
228 230
229 /* Disable pixel clock and compo IP clocks */ 231 /* Disable pixel clock and compo IP clocks */
230 if (mixer->id == STI_MIXER_MAIN) { 232 if (mixer->id == STI_MIXER_MAIN) {