summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2018-02-14 17:28:10 +0100
committerMichel Dänzer <michel@daenzer.net>2018-02-14 17:28:10 +0100
commit703cbb7177c6f69264836e975c1921e552fd60a4 (patch)
treec296812b23976d7fd8b39be7f18330ce915aec62
parent733f606dd6ca8350e6e7f0858bfff5454ddc98ed (diff)
glamor: Allow depth 30 with Xorg >= 1.19.99.1
Corresponding to amdgpu commit 6aee5770fb913713bb1b9a1af8f0d0892a66f21a. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--man/radeon.man2
-rw-r--r--src/radeon_kms.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/man/radeon.man b/man/radeon.man
index 889355bb..dcebf537 100644
--- a/man/radeon.man
+++ b/man/radeon.man
@@ -19,7 +19,7 @@ following features:
.TP 2
\(bu
Full support for 8-, 15-, 16- and 24-bit pixel depths, and for 30-bit depth on Linux 3.16
-and later with EXA acceleration;
+and later;
.TP
\(bu
RandR 1.2 and RandR 1.3 support;
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index bac98cb6..25b889a6 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1767,7 +1767,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
if (!RADEONPreInitAccel_KMS(pScrn)) goto fail;
/* Depth 30 not yet supported under glamor. */
- if (pScrn->depth == 30 && info->use_glamor) {
+ if (pScrn->depth == 30 && info->use_glamor &&
+ xorgGetVersion() < XORG_VERSION_NUMERIC(1,19,99,1,0)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Given depth (%d) is not supported under GLAMOR accel. Select EXA.\n",
pScrn->depth);