[Intel-gfx] [PATCH] Use pipes, not planes for sarea geometry data

[Keith Packard]

Vblank in the kernel is far simpler if it deals with pipes instead of
planes, so we're changing both user and kernel side. This is the user mode
side. This fixes both i830_crtc_dpms and i830PipeSetBase, the two functions
which copy geometry from the crtc to the sarea.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 src/i830_display.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i830_display.c b/src/i830_display.c
index 0632f3a..ef8c887 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -428,7 +428,7 @@ i830PipeSetBase(xf86CrtcPtr crtc, int x, int y)
 	if (!sPriv)
 	    return;
 
-	switch (plane) {
+	switch (pipe) {
 	case 0:
 	    sPriv->planeA_x = x;
 	    sPriv->planeA_y = y;
@@ -756,7 +756,7 @@ static void i830_modeset_ctl(xf86CrtcPtr crtc, int pre)
     if (!pI830->directRenderingEnabled)
       return;
 
-    modeset.crtc = intel_crtc->plane;
+    modeset.crtc = intel_crtc->pipe;
 
     /*
      * DPMS will be called many times (especially off), but we only
@@ -921,7 +921,7 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
 	if (!sPriv)
 	    return;
 
-	switch (plane) {
+	switch (pipe) {
 	case 0:
 	    sPriv->planeA_w = enabled ? crtc->mode.HDisplay : 0;
 	    sPriv->planeA_h = enabled ? crtc->mode.VDisplay : 0;
-- 
1.5.6.5