drm: qxl: Atomic phase 3: Wire up atomic page_flip helper

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170227204328.18761-14-krisman@collabora.co.uk
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index f86e194ed797ed459c1d1ab42937e815f43e922e..2cd14bebc49ca060fe35457d5bf3d591ae8bfad5 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -278,55 +278,10 @@ static void qxl_crtc_destroy(struct drm_crtc *crtc)
        kfree(qxl_crtc);
 }
 
-static int qxl_crtc_page_flip(struct drm_crtc *crtc,
-                              struct drm_framebuffer *fb,
-                              struct drm_pending_vblank_event *event,
-                              uint32_t page_flip_flags)
-{
-       struct drm_device *dev = crtc->dev;
-       struct qxl_device *qdev = dev->dev_private;
-       struct qxl_framebuffer *qfb_src = to_qxl_framebuffer(fb);
-       struct qxl_framebuffer *qfb_old = to_qxl_framebuffer(crtc->primary->fb);
-       struct qxl_bo *bo_old = gem_to_qxl_bo(qfb_old->obj);
-       struct qxl_bo *bo = gem_to_qxl_bo(qfb_src->obj);
-       unsigned long flags;
-       struct drm_clip_rect norect = {
-           .x1 = 0,
-           .y1 = 0,
-           .x2 = fb->width,
-           .y2 = fb->height
-       };
-       int inc = 1;
-       int one_clip_rect = 1;
-       int ret = 0;
-
-       drm_atomic_set_fb_for_plane(crtc->primary->state, fb);
-
-       bo_old->is_primary = false;
-       bo->is_primary = true;
-
-       ret = qxl_bo_pin(bo, bo->type, NULL);
-       if (ret)
-               return ret;
-
-       qxl_draw_dirty_fb(qdev, qfb_src, bo, 0, 0,
-                         &norect, one_clip_rect, inc);
-
-       if (event) {
-               spin_lock_irqsave(&dev->event_lock, flags);
-               drm_crtc_send_vblank_event(crtc, event);
-               spin_unlock_irqrestore(&dev->event_lock, flags);
-       }
-
-       qxl_bo_unpin(bo);
-
-       return 0;
-}
-
 static const struct drm_crtc_funcs qxl_crtc_funcs = {
        .set_config = drm_atomic_helper_set_config,
        .destroy = qxl_crtc_destroy,
-       .page_flip = qxl_crtc_page_flip,
+       .page_flip = drm_atomic_helper_page_flip,
        .reset = drm_atomic_helper_crtc_reset,
        .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
        .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,