84a4590c79
- U_01-* ... U_20-* : Include patches that haven't made it into the 7.7.1 release. This means almost all commits between xf86-video-ati-7.7.0 and 12d30eeb9711bd2b1609d6bbb74c4a1760596f72. Fixes (bsc#990066). OBS-URL: https://build.opensuse.org/request/show/438260 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=51
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From: Michel Dänzer <michel.daenzer@amd.com>
|
|
Date: Fri Aug 26 18:09:03 2016 +0900
|
|
Subject: [PATCH 15/20]Fix build against xserver < 1.13
|
|
Patch-mainline: Upstream
|
|
Git-repo: git://anongit.freedesktop.org/xorg/driver/xf86-video-ati
|
|
Git-commit: a92c27484703abc7c410b6ae0e4b8d1efbbb8e6f
|
|
References: bsc#990066
|
|
Signed-off-by: Max Staudt <mstaudt@suse.de>
|
|
|
|
pScreen->isGPU was only introduced in 1.13.
|
|
|
|
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97490
|
|
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
|
|
---
|
|
src/drmmode_display.c | 5 ++++-
|
|
src/radeon_kms.c | 5 ++++-
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
|
|
index 383c8a0..1fcd7c3 100644
|
|
--- a/src/drmmode_display.c
|
|
+++ b/src/drmmode_display.c
|
|
@@ -795,7 +795,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]);
|