drm/exynos: call exynos_update_plane() directly on page flips
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Tue, 25 Nov 2014 18:18:34 +0000 (16:18 -0200)
committerInki Dae <daeinki@gmail.com>
Sun, 25 Jan 2015 12:28:05 +0000 (21:28 +0900)
Avoid an extra call to exynos_drm_crtc_mode_set_commit() that only calls
exynos_update_plane().

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
drivers/gpu/drm/exynos/exynos_drm_crtc.c

index 4c8bd4d1e861452d5ba873939e0b1438cdd11681..185dabe4e2b79d0f8596d63c6ebc80fd9ae14f0d 100644 (file)
@@ -176,6 +176,7 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
        struct exynos_drm_private *dev_priv = dev->dev_private;
        struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
        struct drm_framebuffer *old_fb = crtc->primary->fb;
+       unsigned int crtc_w, crtc_h;
        int ret = -EINVAL;
 
        /* when the page flip is requested, crtc's dpms should be on */
@@ -207,8 +208,11 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
                spin_unlock_irq(&dev->event_lock);
 
                crtc->primary->fb = fb;
-               ret = exynos_drm_crtc_mode_set_commit(crtc, crtc->x, crtc->y,
-                                                   NULL);
+               crtc_w = fb->width - crtc->x;
+               crtc_h = fb->height - crtc->y;
+               ret = exynos_update_plane(crtc->primary, crtc, fb, 0, 0,
+                                         crtc_w, crtc_h, crtc->x, crtc->y,
+                                         crtc_w, crtc_h);
                if (ret) {
                        crtc->primary->fb = old_fb;