diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2017-10-04 11:11:33 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2017-10-04 11:11:33 +0200 |
| commit | 7d435354099119234d443b07e2df1c7b9f97cf3c (patch) | |
| tree | a4badf33f4e31628687b1bc3ea4b1d768bb8f244 | |
| parent | b71836c9962f8f2eadf0c2188e03faed737c18da (diff) | |
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.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | src/radeon_kms.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index b982e425..9ef51693 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -1331,9 +1331,10 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "GPU accel disabled or not working, using shadowfb for KMS\n"); shadowfb: - info->r600_shadow_fb = TRUE; if (!xf86LoadSubModule(pScrn, "shadow")) - info->r600_shadow_fb = FALSE; + return FALSE; + + info->r600_shadow_fb = TRUE; return TRUE; } @@ -2215,7 +2216,7 @@ Bool RADEONScreenInit_KMS(ScreenPtr pScreen, int argc, char **argv) if (info->fb_shadow == NULL) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to allocate shadow framebuffer\n"); - info->r600_shadow_fb = FALSE; + return FALSE; } else { if (!fbScreenInit(pScreen, info->fb_shadow, pScrn->virtualX, pScrn->virtualY, |