[PATCH 1/7] Rename scanout_pixmap_x field to prime_pixmap_x

[Michel Dänzer]

From: Michel Dänzer <michel.daen...@amd.com>

To avoid confusion with upcoming changes.

Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
---
 src/drmmode_display.c | 6 +++---
 src/drmmode_display.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e81c6d4..db7ef95 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -560,7 +560,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr 
mode,
                fb_id = drmmode->fb_id;
 #ifdef RADEON_PIXMAP_SHARING
                if (crtc->randr_crtc && crtc->randr_crtc->scanout_pixmap) {
-                       x = drmmode_crtc->scanout_pixmap_x;
+                       x = drmmode_crtc->prime_pixmap_x;
                        y = 0;
                } else
 #endif
@@ -799,7 +799,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
        if (!ppix) {
                if (crtc->randr_crtc->scanout_pixmap)
                        
PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
-               drmmode_crtc->scanout_pixmap_x = 0;
+               drmmode_crtc->prime_pixmap_x = 0;
                return TRUE;
        }
 
@@ -838,7 +838,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
                screen->width = screenpix->drawable.width = total_width;
                screen->height = screenpix->drawable.height = max_height;
        }
-       drmmode_crtc->scanout_pixmap_x = this_x;
+       drmmode_crtc->prime_pixmap_x = this_x;
 #ifdef HAS_DIRTYTRACKING2
        PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
 #else
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index c6c076c..245588c 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -85,7 +85,7 @@ typedef struct {
     int dpms_last_fps;
     uint32_t interpolated_vblanks;
     uint16_t lut_r[256], lut_g[256], lut_b[256];
-    int scanout_pixmap_x;
+    int prime_pixmap_x;
 } drmmode_crtc_private_rec, *drmmode_crtc_private_ptr;
 
 typedef struct {
-- 
2.1.4

_______________________________________________
xorg-driver-ati mailing list
xorg-driver-ati@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-driver-ati