intel: disentangle planes & pipes

This is the Mesa portion of the pipe & plane disambiguation.  Mesa needs to use
the new assumptions about plane vs. pipe mappings and should use the new SAREA
field names to avoid confusion.

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 11c23f24a1b8538d1c496f3b3223b35165605d89..07bee4ef9f93f6bcb2dec60c1b88b22307378f82 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -564,16 +564,16 @@ void intelWindowMoved( intelContextPtr intel )
         drmI830Sarea *sarea = intel->sarea;
         drm_clip_rect_t drw_rect = { .x1 = dPriv->x, .x2 = dPriv->x + dPriv->w,
                                      .y1 = dPriv->y, .y2 = dPriv->y + dPriv->h };
-        drm_clip_rect_t pipeA_rect = { .x1 = sarea->pipeA_x,
-                                       .x2 = sarea->pipeA_x + sarea->pipeA_w,
-                                       .y1 = sarea->pipeA_y,
-                                       .y2 = sarea->pipeA_y + sarea->pipeA_h };
-        drm_clip_rect_t pipeB_rect = { .x1 = sarea->pipeB_x,
-                                       .x2 = sarea->pipeB_x + sarea->pipeB_w,
-                                       .y1 = sarea->pipeB_y,
-                                       .y2 = sarea->pipeB_y + sarea->pipeB_h };
-        GLint areaA = driIntersectArea( drw_rect, pipeA_rect );
-        GLint areaB = driIntersectArea( drw_rect, pipeB_rect );
+        drm_clip_rect_t planeA_rect = { .x1 = sarea->planeA_x,
+                                       .x2 = sarea->planeA_x + sarea->planeA_w,
+                                       .y1 = sarea->planeA_y,
+                                       .y2 = sarea->planeA_y + sarea->planeA_h };
+        drm_clip_rect_t planeB_rect = { .x1 = sarea->planeB_x,
+                                       .x2 = sarea->planeB_x + sarea->planeB_w,
+                                       .y1 = sarea->planeB_y,
+                                       .y2 = sarea->planeB_y + sarea->planeB_h };
+        GLint areaA = driIntersectArea( drw_rect, planeA_rect );
+        GLint areaB = driIntersectArea( drw_rect, planeB_rect );
         GLuint flags = intel->vblank_flags;
 
         if (areaB > areaA || (areaA == areaB && areaB > 0)) {

diff --git a/src/mesa/drivers/dri/i915/server/i830_common.h b/src/mesa/drivers/dri/i915/server/i830_common.h
index fb6ceaa52d43ff8b2d4f845dedf3abc038dc733e..a5d2598849b744b69a2dc8e2865c5c5b2f98c125 100644 (file)
--- a/src/mesa/drivers/dri/i915/server/i830_common.h
+++ b/src/mesa/drivers/dri/i915/server/i830_common.h
@@ -119,14 +119,17 @@ typedef struct {
        unsigned int rotated_tiled;
        unsigned int rotated2_tiled;
 
-       int pipeA_x;
-       int pipeA_y;
-       int pipeA_w;
-       int pipeA_h;
-       int pipeB_x;
-       int pipeB_y;
-       int pipeB_w;
-       int pipeB_h;
+       int planeA_x;
+       int planeA_y;
+       int planeA_w;
+       int planeA_h;
+       int planeB_x;
+       int planeB_y;
+       int planeB_w;
+       int planeB_h;
+
+       int planeA_pipe;
+       int planeB_pipe;
 } drmI830Sarea;
 
 /* Flags for perf_boxes

diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915tex/intel_buffers.c
index 15d02f8e2cf0771619309c5c6ab4b68ea9d4524c..40f93dac912f97cb6e77985490765815f85595c3 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915tex/intel_buffers.c
@@ -50,7 +50,7 @@
 #define DRM_VBLANK_FLIP 0x8000000
 
 typedef struct drm_i915_flip {
-   int pipes;
+   int planes;
 } drm_i915_flip_t;
 
 #undef DRM_IOCTL_I915_FLIP
@@ -235,34 +235,34 @@ intelWindowMoved(struct intel_context *intel)
       drmI830Sarea *sarea = intel->sarea;
       drm_clip_rect_t drw_rect = { .x1 = dPriv->x, .x2 = dPriv->x + dPriv->w,
                                   .y1 = dPriv->y, .y2 = dPriv->y + dPriv->h };
-      drm_clip_rect_t pipeA_rect = { .x1 = sarea->pipeA_x, .y1 = sarea->pipeA_y,
-                                    .x2 = sarea->pipeA_x + sarea->pipeA_w,
-                                    .y2 = sarea->pipeA_y + sarea->pipeA_h };
-      drm_clip_rect_t pipeB_rect = { .x1 = sarea->pipeB_x, .y1 = sarea->pipeB_y,
-                                    .x2 = sarea->pipeB_x + sarea->pipeB_w,
-                                    .y2 = sarea->pipeB_y + sarea->pipeB_h };
-      GLint areaA = driIntersectArea( drw_rect, pipeA_rect );
-      GLint areaB = driIntersectArea( drw_rect, pipeB_rect );
+      drm_clip_rect_t planeA_rect = { .x1 = sarea->planeA_x, .y1 = sarea->planeA_y,
+                                    .x2 = sarea->planeA_x + sarea->planeA_w,
+                                    .y2 = sarea->planeA_y + sarea->planeA_h };
+      drm_clip_rect_t planeB_rect = { .x1 = sarea->planeB_x, .y1 = sarea->planeB_y,
+                                    .x2 = sarea->planeB_x + sarea->planeB_w,
+                                    .y2 = sarea->planeB_y + sarea->planeB_h };
+      GLint areaA = driIntersectArea( drw_rect, planeA_rect );
+      GLint areaB = driIntersectArea( drw_rect, planeB_rect );
       GLuint flags = intel_fb->vblank_flags;
       GLboolean pf_active;
-      GLint pf_pipes;
+      GLint pf_planes;
 
       /* Update page flipping info
        */
-      pf_pipes = 0;
+      pf_planes = 0;
 
       if (areaA > 0)
-        pf_pipes |= 1;
+        pf_planes |= 1;
 
       if (areaB > 0)
-        pf_pipes |= 2;
+        pf_planes |= 2;
 
       intel_fb->pf_current_page = (intel->sarea->pf_current_page >>
-                                  (intel_fb->pf_pipes & 0x2)) & 0x3;
+                                  (intel_fb->pf_planes & 0x2)) & 0x3;
 
       intel_fb->pf_num_pages = intel->intelScreen->third.handle ? 3 : 2;
 
-      pf_active = pf_pipes && (pf_pipes & intel->sarea->pf_active) == pf_pipes;
+      pf_active = pf_planes && (pf_planes & intel->sarea->pf_active) == pf_planes;
 
       if (INTEL_DEBUG & DEBUG_LOCK)
         if (pf_active != intel_fb->pf_active)
@@ -270,8 +270,8 @@ intelWindowMoved(struct intel_context *intel)
                         pf_active ? "" : "in");
 
       if (pf_active) {
-        /* Sync pages between pipes if we're flipping on both at the same time */
-        if (pf_pipes == 0x3 && pf_pipes != intel_fb->pf_pipes &&
+        /* Sync pages between planes if flipping on both at the same time */
+        if (pf_planes == 0x3 && pf_planes != intel_fb->pf_planes &&
             (intel->sarea->pf_current_page & 0x3) !=
             (((intel->sarea->pf_current_page) >> 2) & 0x3)) {
            drm_i915_flip_t flip;
@@ -287,7 +287,7 @@ intelWindowMoved(struct intel_context *intel)
                  ((intel_fb->pf_current_page + intel_fb->pf_num_pages - 1) %
                   intel_fb->pf_num_pages) << 2;
 
-              flip.pipes = 0x2;
+              flip.planes = 0x2;
            } else {
                intel->sarea->pf_current_page =
                  intel->sarea->pf_current_page & (0x3 << 2);
@@ -295,13 +295,13 @@ intelWindowMoved(struct intel_context *intel)
                  (intel_fb->pf_current_page + intel_fb->pf_num_pages - 1) %
                  intel_fb->pf_num_pages;
 
-              flip.pipes = 0x1;
+              flip.planes = 0x1;
            }
 
            drmCommandWrite(intel->driFd, DRM_I915_FLIP, &flip, sizeof(flip));
         }
 
-        intel_fb->pf_pipes = pf_pipes;
+        intel_fb->pf_planes = pf_planes;
       }
 
       intel_fb->pf_active = pf_active;
@@ -715,14 +715,14 @@ intel_wait_flips(struct intel_context *intel, GLuint batch_flags)
                             BUFFER_BACK_LEFT);
 
    if (intel_fb->Base.Name == 0 && intel_rb->pf_pending == intel_fb->pf_seq) {
-      GLint pf_pipes = intel_fb->pf_pipes;
+      GLint pf_planes = intel_fb->pf_planes;
       BATCH_LOCALS;
 
       /* Wait for pending flips to take effect */
       BEGIN_BATCH(2, batch_flags);
-      OUT_BATCH(pf_pipes & 0x1 ? (MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_A_FLIP)
+      OUT_BATCH(pf_planes & 0x1 ? (MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_A_FLIP)
                : 0);
-      OUT_BATCH(pf_pipes & 0x2 ? (MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_B_FLIP)
+      OUT_BATCH(pf_planes & 0x2 ? (MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_B_FLIP)
                : 0);
       ADVANCE_BATCH();
 
@@ -761,7 +761,7 @@ intelPageFlip(const __DRIdrawablePrivate * dPriv)
    if (dPriv->numClipRects && intel_fb->pf_active) {
       drm_i915_flip_t flip;
 
-      flip.pipes = intel_fb->pf_pipes;
+      flip.planes = intel_fb->pf_planes;
 
       ret = drmCommandWrite(intel->driFd, DRM_I915_FLIP, &flip, sizeof(flip));
    }
@@ -776,7 +776,7 @@ intelPageFlip(const __DRIdrawablePrivate * dPriv)
    }
 
    intel_fb->pf_current_page = (intel->sarea->pf_current_page >>
-                               (intel_fb->pf_pipes & 0x2)) & 0x3;
+                               (intel_fb->pf_planes & 0x2)) & 0x3;
 
    if (dPriv->numClipRects != 0) {
       intel_get_renderbuffer(&intel_fb->Base, BUFFER_FRONT_LEFT)->pf_pending =
@@ -860,7 +860,7 @@ intelScheduleSwap(const __DRIdrawablePrivate * dPriv, GLboolean *missed_target)
       swap.seqtype |= DRM_VBLANK_FLIP;
 
       intel_fb->pf_current_page = (((intel->sarea->pf_current_page >>
-                                    (intel_fb->pf_pipes & 0x2)) & 0x3) + 1) %
+                                    (intel_fb->pf_planes & 0x2)) & 0x3) + 1) %
                                  intel_fb->pf_num_pages;
    }
 
@@ -884,7 +884,7 @@ intelScheduleSwap(const __DRIdrawablePrivate * dPriv, GLboolean *missed_target)
    } else {
       if (swap.seqtype & DRM_VBLANK_FLIP) {
         intel_fb->pf_current_page = ((intel->sarea->pf_current_page >>
-                                       (intel_fb->pf_pipes & 0x2)) & 0x3) %
+                                       (intel_fb->pf_planes & 0x2)) & 0x3) %
                                     intel_fb->pf_num_pages;
       }
 

diff --git a/src/mesa/drivers/dri/i915tex/intel_fbo.h b/src/mesa/drivers/dri/i915tex/intel_fbo.h
index 963f5e706f4b39948fb5831e32e451fba9148a5f..411d634231739da545b8e45b2a409176cde374fc 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/intel_fbo.h
+++ b/src/mesa/drivers/dri/i915tex/intel_fbo.h
@@ -44,7 +44,7 @@ struct intel_framebuffer
    /* Drawable page flipping state */
    GLboolean pf_active;
    GLuint pf_seq;
-   GLint pf_pipes;
+   GLint pf_planes;
    GLint pf_current_page;
    GLint pf_num_pages;
 

diff --git a/src/mesa/drivers/dri/i915tex/server/i830_common.h b/src/mesa/drivers/dri/i915tex/server/i830_common.h
index d4d58886ce07a7e99784f91406b61000ef9eba3b..07cc63f66319f0b791a86d3471df9c2e2298db7c 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/server/i830_common.h
+++ b/src/mesa/drivers/dri/i915tex/server/i830_common.h
@@ -121,14 +121,17 @@ typedef struct {
        unsigned int rotated_tiled;
        unsigned int rotated2_tiled;
 
-       int pipeA_x;
-       int pipeA_y;
-       int pipeA_w;
-       int pipeA_h;
-       int pipeB_x;
-       int pipeB_y;
-       int pipeB_w;
-       int pipeB_h;
+       int planeA_x;
+       int planeA_y;
+       int planeA_w;
+       int planeA_h;
+       int planeB_x;
+       int planeB_y;
+       int planeB_w;
+       int planeB_h;
+
+       int planeA_pipe;
+       int planeB_pipe;
 
        /* Triple buffering */
        drm_handle_t third_handle;