diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2015-03-19 17:46:48 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-04-03 11:42:00 +0900 |
| commit | c32b0530302739f6512755bccf281c2300617376 (patch) | |
| tree | c04041f5a86c6d9e94a409f5bc57cc6112be8198 /src | |
| parent | 5921ba4ca705a0d919515626088f3948cc4848c1 (diff) | |
Rename scanout_pixmap_x field to prime_pixmap_x
To avoid confusion with upcoming changes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/drmmode_display.c | 6 | ||||
| -rw-r--r-- | 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 e81c6d48..db7ef953 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 c6c076cf..245588cc 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 { |