i915: Page flipping enhancements.

Leave it to the client to wait for the flip to complete when necessary,
but wait for a previous flip to complete before emitting another one. This
should help avoid unnecessary stalling of the ring due to pending flips.

Call i915_do_cleanup_pageflip() unconditionally in preclose.

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 82fde7e..18fe088 100644 (file)
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -570,6 +570,12 @@ static int i915_dispatch_flip(drm_device_t * dev)
        OUT_RING(0);
        ADVANCE_LP_RING();
 
+       /* Wait for a pending flip to take effect */
+       BEGIN_LP_RING(2);
+       OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_A_FLIP);
+       OUT_RING(0);
+       ADVANCE_LP_RING();
+
        BEGIN_LP_RING(6);
        OUT_RING(CMD_OP_DISPLAYBUFFER_INFO | ASYNC_FLIP);
        OUT_RING(0);
@@ -583,10 +589,6 @@ static int i915_dispatch_flip(drm_device_t * dev)
        OUT_RING(0);
        ADVANCE_LP_RING();
 
-       BEGIN_LP_RING(2);
-       OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_A_FLIP);
-       OUT_RING(0);
-       ADVANCE_LP_RING();
        i915_emit_breadcrumb(dev);
 #ifdef I915_HAVE_FENCE
        drm_fence_flush_old(dev, 0, dev_priv->counter);
@@ -856,9 +858,7 @@ void i915_driver_preclose(drm_device_t * dev, DRMFILE filp)
 {
        if (dev->dev_private) {
                drm_i915_private_t *dev_priv = dev->dev_private;
-               if (dev_priv->page_flipping) {
-                       i915_do_cleanup_pageflip(dev);
-               }
+               i915_do_cleanup_pageflip(dev);
                i915_mem_release(dev, filp, dev_priv->agp_heap);
        }
 }

diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index f922d1f..a81653a 100644 (file)
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -102,7 +102,6 @@ typedef struct drm_i915_private {
        int back_offset;
        int front_offset;
        int current_page;
-       int page_flipping;
        int use_mi_batchbuffer_start;
 
        wait_queue_head_t irq_queue;