From b67a2b62b20c17db7471f5bbea591ab55806cb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 19 Oct 2017 16:46:35 +0200 Subject: [PATCH] Bail if there's a problem with ShadowFB If we hit a problem while setting up ShadowFB, just carrying on trying to set up HW acceleration instead is unlikely to work. (Ported from radeon commit 7d435354099119234d443b07e2df1c7b9f97cf3c) Reviewed-by: Alex Deucher --- src/amdgpu_kms.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c index e3d7d71..3598dd2 100644 --- a/src/amdgpu_kms.c +++ b/src/amdgpu_kms.c @@ -1174,11 +1174,11 @@ static Bool AMDGPUPreInitAccel_KMS(ScrnInfoPtr pScrn) "GPU acceleration disabled, using ShadowFB\n"); } + if (!xf86LoadSubModule(pScrn, "shadow")) + return FALSE; + info->dri2.available = FALSE; info->shadow_fb = TRUE; - if (!xf86LoadSubModule(pScrn, "shadow")) - info->shadow_fb = FALSE; - return TRUE; } @@ -1727,7 +1727,7 @@ Bool AMDGPUScreenInit_KMS(ScreenPtr pScreen, int argc, char **argv) if (info->fb_shadow == NULL) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to allocate shadow framebuffer\n"); - info->shadow_fb = FALSE; + return FALSE; } else { if (!fbScreenInit(pScreen, info->fb_shadow, pScrn->virtualX, pScrn->virtualY,