xf86-video-ati: Branch 'master'
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon Aug 29 01:57:28 UTC 2016
src/drmmode_display.c | 5 ++++-
src/radeon_kms.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit a92c27484703abc7c410b6ae0e4b8d1efbbb8e6f
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri Aug 26 18:09:03 2016 +0900
Fix build against xserver < 1.13
pScreen->isGPU was only introduced in 1.13.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97490
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e474046..2afeeb0 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -799,7 +799,10 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
drmmode_crtc_scanout_destroy(drmmode, &drmmode_crtc->scanout[0]);
drmmode_crtc_scanout_destroy(drmmode, &drmmode_crtc->scanout[1]);
- } else if (!pScreen->isGPU &&
+ } else if (
+#ifdef RADEON_PIXMAP_SHARING
+ !pScreen->isGPU &&
+#endif
(info->tear_free ||
#if XF86_CRTC_VERSION >= 4
crtc->driverIsPerformingTransform ||
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index c10fb42..51f320c 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -842,7 +842,10 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
(*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
pScreen->BlockHandler = RADEONBlockHandler_KMS;
- if (!pScreen->isGPU) {
+#ifdef RADEON_PIXMAP_SHARING
+ if (!pScreen->isGPU)
+#endif
+ {
for (c = 0; c < xf86_config->num_crtc; c++) {
if (info->tear_free)
radeon_scanout_flip(pScreen, info, xf86_config->crtc[c]);
More information about the xorg-commit
mailing list