[PATCH xf86-video-amdgpu 4/6] DRI3 only works with acceleration

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer at amd.com>

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94214

(Ported from radeon commit d21ac4669a8b2cdd4eec5e5a94d1950b7423b8b5)

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/amdgpu_kms.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index f814dc0..51302e2 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -1221,13 +1221,16 @@ Bool AMDGPUScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
 
 	value = FALSE;
 	from = X_DEFAULT;
-	if (xf86GetOptValBool(info->Options, OPTION_DRI3, &value))
-		from = X_CONFIG;
 
-	if (xf86GetOptValInteger(info->Options, OPTION_DRI, &driLevel) &&
-	    (driLevel == 2 || driLevel == 3)) {
-		from = X_CONFIG;
-		value = driLevel == 3;
+	if (info->use_glamor) {
+		if (xf86GetOptValBool(info->Options, OPTION_DRI3, &value))
+			from = X_CONFIG;
+
+		if (xf86GetOptValInteger(info->Options, OPTION_DRI, &driLevel) &&
+			(driLevel == 2 || driLevel == 3)) {
+			from = X_CONFIG;
+			value = driLevel == 3;
+		}
 	}
 
 	if (value) {
-- 
2.8.0.rc3