Revert drm_i915_flip_t braindamage

I should not have renamed this field.
I should not have renamed this field.
I should not have renamed this field.

On the plus side, it was at least binary compatible.

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index daa03df..3a9ecab 100644 (file)
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -755,13 +755,14 @@ static int i915_flip_bufs(struct drm_device *dev, void *data, struct drm_file *f
 
        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-       if (param->planes & ~0x3) {
+       /* This is really planes */
+       if (param->pipes & ~0x3) {
                DRM_ERROR("Invalid planes 0x%x, only <= 0x3 is valid\n",
-                         param->planes);
+                         param->pipes);
                return -EINVAL;
        }
 
-       i915_dispatch_flip(dev, param->planes, 0);
+       i915_dispatch_flip(dev, param->pipes, 0);
 
        return 0;
 }

diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
index a57ffa7..9976804 100644 (file)
--- a/shared-core/i915_drm.h
+++ b/shared-core/i915_drm.h
@@ -182,7 +182,13 @@ typedef struct _drm_i915_sarea {
 /* Asynchronous page flipping:
  */
 typedef struct drm_i915_flip {
-       int planes;
+       /*
+        * This is really talking about planes, and we could rename it
+        * except for the fact that some of the duplicated i915_drm.h files
+        * out there check for HAVE_I915_FLIP and so might pick up this
+        * version.
+        */
+       int pipes;
 } drm_i915_flip_t;
 
 /* Allow drivers to submit batchbuffers directly to hardware, relying