Revert "drm/vbl rework: rework how the drm deals with vblank."

This reverts commit ac741ab71bb39e6977694ac0cc26678d8673cda4.

Okay this looks like wasn't as fully baked as I'd led myself to believe.

Revert for now for further baking.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 41 insertions, 119 deletions

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index f47e46e3529f..88974342933c 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -415,13 +415,10 @@ static void i915_emit_breadcrumb(struct drm_device *dev)
         drm_i915_private_t *dev_priv = dev->dev_private;
         RING_LOCALS;
 
-        if (++dev_priv->counter > BREADCRUMB_MASK) {
-                 dev_priv->counter = 1;
-                 DRM_DEBUG("Breadcrumb counter wrapped around\n");
-        }
+        dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter;
 
-        if (dev_priv->sarea_priv)
-                dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
+        if (dev_priv->counter > 0x7FFFFFFFUL)
+                dev_priv->sarea_priv->last_enqueue = dev_priv->counter = 1;
 
         BEGIN_LP_RING(4);
         OUT_RING(CMD_STORE_DWORD_IDX);
@@ -431,26 +428,6 @@ static void i915_emit_breadcrumb(struct drm_device *dev)
         ADVANCE_LP_RING();
 }
 
-int i915_emit_mi_flush(struct drm_device *dev, uint32_t flush)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        uint32_t flush_cmd = CMD_MI_FLUSH;
-        RING_LOCALS;
-
-        flush_cmd |= flush;
-
-        i915_kernel_lost_context(dev);
-
-        BEGIN_LP_RING(4);
-        OUT_RING(flush_cmd);
-        OUT_RING(0);
-        OUT_RING(0);
-        OUT_RING(0);
-        ADVANCE_LP_RING();
-
-        return 0;
-}
-
 static int i915_dispatch_cmdbuffer(struct drm_device * dev,
                                    drm_i915_cmdbuffer_t * cmd)
 {
@@ -534,74 +511,52 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
         return 0;
 }
 
-static void i915_do_dispatch_flip(struct drm_device * dev, int plane, int sync)
+static int i915_dispatch_flip(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
-        u32 num_pages, current_page, next_page, dspbase;
-        int shift = 2 * plane, x, y;
         RING_LOCALS;
 
-        /* Calculate display base offset */
-        num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
-        current_page = (dev_priv->sarea_priv->pf_current_page >> shift) & 0x3;
-        next_page = (current_page + 1) % num_pages;
+        DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
+                  __FUNCTION__,
+                  dev_priv->current_page,
+                  dev_priv->sarea_priv->pf_current_page);
 
-        switch (next_page) {
-        default:
-        case 0:
-                dspbase = dev_priv->sarea_priv->front_offset;
-                break;
-        case 1:
-                dspbase = dev_priv->sarea_priv->back_offset;
-                break;
-        case 2:
-                dspbase = dev_priv->sarea_priv->third_offset;
-                break;
-        }
+        i915_kernel_lost_context(dev);
+
+        BEGIN_LP_RING(2);
+        OUT_RING(INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE);
+        OUT_RING(0);
+        ADVANCE_LP_RING();
 
-        if (plane == 0) {
-                x = dev_priv->sarea_priv->planeA_x;
-                y = dev_priv->sarea_priv->planeA_y;
+        BEGIN_LP_RING(6);
+        OUT_RING(CMD_OP_DISPLAYBUFFER_INFO | ASYNC_FLIP);
+        OUT_RING(0);
+        if (dev_priv->current_page == 0) {
+                OUT_RING(dev_priv->back_offset);
+                dev_priv->current_page = 1;
         } else {
-                x = dev_priv->sarea_priv->planeB_x;
-                y = dev_priv->sarea_priv->planeB_y;
+                OUT_RING(dev_priv->front_offset);
+                dev_priv->current_page = 0;
         }
+        OUT_RING(0);
+        ADVANCE_LP_RING();
 
-        dspbase += (y * dev_priv->sarea_priv->pitch + x) * dev_priv->cpp;
+        BEGIN_LP_RING(2);
+        OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_A_FLIP);
+        OUT_RING(0);
+        ADVANCE_LP_RING();
 
-        DRM_DEBUG("plane=%d current_page=%d dspbase=0x%x\n", plane, current_page,
-                  dspbase);
+        dev_priv->sarea_priv->last_enqueue = dev_priv->counter++;
 
         BEGIN_LP_RING(4);
-        OUT_RING(sync ? 0 :
-                 (MI_WAIT_FOR_EVENT | (plane ? MI_WAIT_FOR_PLANE_B_FLIP :
-                                       MI_WAIT_FOR_PLANE_A_FLIP)));
-        OUT_RING(CMD_OP_DISPLAYBUFFER_INFO | (sync ? 0 : ASYNC_FLIP) |
-                 (plane ? DISPLAY_PLANE_B : DISPLAY_PLANE_A));
-        OUT_RING(dev_priv->sarea_priv->pitch * dev_priv->cpp);
-        OUT_RING(dspbase);
+        OUT_RING(CMD_STORE_DWORD_IDX);
+        OUT_RING(20);
+        OUT_RING(dev_priv->counter);
+        OUT_RING(0);
         ADVANCE_LP_RING();
 
-        dev_priv->sarea_priv->pf_current_page &= ~(0x3 << shift);
-        dev_priv->sarea_priv->pf_current_page |= next_page << shift;
-}
-
-void i915_dispatch_flip(struct drm_device * dev, int planes, int sync)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        int i;
-
-        DRM_DEBUG("planes=0x%x pfCurrentPage=%d\n",
-                  planes, dev_priv->sarea_priv->pf_current_page);
-
-        i915_emit_mi_flush(dev, MI_READ_FLUSH | MI_EXE_FLUSH);
-
-        for (i = 0; i < 2; i++)
-                if (planes & (1 << i))
-                        i915_do_dispatch_flip(dev, i, sync);
-
-        i915_emit_breadcrumb(dev);
-
+        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
+        return 0;
 }
 
 static int i915_quiescent(struct drm_device * dev)
@@ -624,6 +579,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
                             struct drm_file *file_priv)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        u32 *hw_status = dev_priv->hw_status_page;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
             dev_priv->sarea_priv;
         drm_i915_batchbuffer_t *batch = data;
@@ -646,7 +602,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
 
         ret = i915_dispatch_batchbuffer(dev, batch);
 
-        sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
+        sarea_priv->last_dispatch = (int)hw_status[5];
         return ret;
 }
 
@@ -654,6 +610,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                           struct drm_file *file_priv)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        u32 *hw_status = dev_priv->hw_status_page;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
             dev_priv->sarea_priv;
         drm_i915_cmdbuffer_t *cmdbuf = data;
@@ -678,51 +635,18 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                 return ret;
         }
 
-        sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
-        return 0;
-}
-
-static int i915_do_cleanup_pageflip(struct drm_device * dev)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        int i, planes, num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
-
-        DRM_DEBUG("\n");
-
-        for (i = 0, planes = 0; i < 2; i++)
-                if (dev_priv->sarea_priv->pf_current_page & (0x3 << (2 * i))) {
-                        dev_priv->sarea_priv->pf_current_page =
-                                (dev_priv->sarea_priv->pf_current_page &
-                                 ~(0x3 << (2 * i))) | ((num_pages - 1) << (2 * i));
-
-                        planes |= 1 << i;
-                }
-
-        if (planes)
-                i915_dispatch_flip(dev, planes, 0);
-
+        sarea_priv->last_dispatch = (int)hw_status[5];
         return 0;
 }
 
 static int i915_flip_bufs(struct drm_device *dev, void *data,
                           struct drm_file *file_priv)
 {
-        drm_i915_flip_t *param = data;
-
-        DRM_DEBUG("\n");
+        DRM_DEBUG("%s\n", __FUNCTION__);
 
         LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-        /* This is really planes */
-        if (param->pipes & ~0x3) {
-                DRM_ERROR("Invalid planes 0x%x, only <= 0x3 is valid\n",
-                          param->pipes);
-                return -EINVAL;
-        }
-
-        i915_dispatch_flip(dev, param->pipes, 0);
-
-        return 0;
+        return i915_dispatch_flip(dev);
 }
 
 static int i915_getparam(struct drm_device *dev, void *data,
@@ -883,8 +807,6 @@ void i915_driver_lastclose(struct drm_device * dev)
         if (!dev_priv)
                 return;
 
-        if (drm_getsarea(dev) && dev_priv->sarea_priv)
-                i915_do_cleanup_pageflip(dev);
         if (dev_priv->agp_heap)
                 i915_mem_takedown(&(dev_priv->agp_heap));