drm/radeon: separate vblank and pflip crtc handling

[deliverable/linux.git] / drivers / gpu / drm / radeon / radeon_display.c

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 8d99d5ee8014c4f23e031a31cbeab85bde33d81a..88e3cbe11dad7d0c1d13769de890d62a30b71865 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -276,7 +276,7 @@ static void radeon_unpin_work_func(struct work_struct *__work)
        kfree(work);
 }
 
-void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
+void radeon_crtc_handle_vblank(struct radeon_device *rdev, int crtc_id)
 {
        struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
        struct radeon_unpin_work *work;
@@ -294,14 +294,14 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
        /* New pageflip, or just completion of a previous one? */
        if (!radeon_crtc->deferred_flip_completion) {
                /* do the flip (mmio) */
-               update_pending = radeon_page_flip(rdev, crtc_id, work->new_crtc_base);
+               radeon_page_flip(rdev, crtc_id, work->new_crtc_base);
+               update_pending = radeon_page_flip_pending(rdev, crtc_id);
        } else {
                /* This is just a completion of a flip queued in crtc
                 * at last invocation. Make sure we go directly to
                 * completion routine.
                 */
                update_pending = 0;
-               radeon_crtc->deferred_flip_completion = 0;
        }
 
        /* Has the pageflip already completed in crtc, or is it certain
@@ -329,10 +329,40 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
                radeon_crtc->deferred_flip_completion = 1;
                spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
                return;
+       } else {
+               spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
+               radeon_crtc_handle_flip(rdev, crtc_id);
+       }
+}
+
+/**
+ * radeon_crtc_handle_flip - page flip completed
+ *
+ * @rdev: radeon device pointer
+ * @crtc_id: crtc number this event is for
+ *
+ * Called when we are sure that a page flip for this crtc is completed.
+ */
+void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
+{
+       struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
+       struct radeon_unpin_work *work;
+       unsigned long flags;
+
+       /* this can happen at init */
+       if (radeon_crtc == NULL)
+               return;
+
+       spin_lock_irqsave(&rdev->ddev->event_lock, flags);
+       work = radeon_crtc->unpin_work;
+       if (work == NULL) {
+               spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
+               return;
        }
 
        /* Pageflip (will be) certainly completed in this vblank. Clean up. */
        radeon_crtc->unpin_work = NULL;
+       radeon_crtc->deferred_flip_completion = 0;
 
        /* wakeup userspace */
        if (work->event)
@@ -340,9 +370,8 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
 
        spin_unlock_irqrestore(&rdev->ddev->event_lock, flags);
 
-       drm_vblank_put(rdev->ddev, radeon_crtc->crtc_id);
        radeon_fence_unref(&work->fence);
-       radeon_post_page_flip(work->rdev, work->crtc_id);
+       radeon_irq_kms_pflip_irq_get(rdev, work->crtc_id);
        schedule_work(&work->work);
 }
 
@@ -464,27 +493,11 @@ static int radeon_crtc_page_flip(struct drm_crtc *crtc,
        /* update crtc fb */
        crtc->primary->fb = fb;
 
-       r = drm_vblank_get(dev, radeon_crtc->crtc_id);
-       if (r) {
-               DRM_ERROR("failed to get vblank before flip\n");
-               goto pflip_cleanup1;
-       }
-
        /* set the proper interrupt */
-       radeon_pre_page_flip(rdev, radeon_crtc->crtc_id);
+       radeon_irq_kms_pflip_irq_get(rdev, radeon_crtc->crtc_id);
 
        return 0;
 
-pflip_cleanup1:
-       if (unlikely(radeon_bo_reserve(rbo, false) != 0)) {
-               DRM_ERROR("failed to reserve new rbo in error path\n");
-               goto pflip_cleanup;
-       }
-       if (unlikely(radeon_bo_unpin(rbo) != 0)) {
-               DRM_ERROR("failed to unpin new rbo in error path\n");
-       }
-       radeon_bo_unreserve(rbo);
-
 pflip_cleanup:
        spin_lock_irqsave(&dev->event_lock, flags);
        radeon_crtc->unpin_work = NULL;