diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2018-01-24 12:29:17 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2018-02-15 17:28:04 +0100 |
| commit | 680b4ab43f00b1f635f9359281e13a031d09ad24 (patch) | |
| tree | e6bfeb3242ef977e579cf8acde313ea40d7fd785 | |
| parent | 16954fab59f95bdca4540c4496b2ec0759c447e9 (diff) | |
If glamor is too old for depth 30, fall back to EXA or ShadowFB
Instead of not starting up at all.
Corresponding to amdgpu commit 37c7260bdef3a53b0f0295a531f33938e9aad8cf.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/radeon_glamor.c | 8 | ||||
| -rw-r--r-- | src/radeon_kms.c | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index 5f378743..7c09abba 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -119,6 +119,14 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) return FALSE; } + if (scrn->depth == 30 && + xorgGetVersion() < XORG_VERSION_NUMERIC(1,19,99,1,0)) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "Depth 30 is not supported by GLAMOR with Xorg < " + "1.19.99.1\n"); + return FALSE; + } + #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,15,0,0,0) if (!xf86LoaderCheckSymbol("glamor_egl_init")) { xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING, diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 6e5bf781..b268f7ea 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -1775,15 +1775,6 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags) if (!RADEONPreInitAccel_KMS(pScrn)) return FALSE; - /* Depth 30 not yet supported under 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); - return FALSE; - } - /* Depth 30 only supported since Linux 3.16 / kms driver minor version 39 */ if (pScrn->depth == 30 && info->dri2.pKernelDRMVersion->version_minor < 39) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |