summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-12-01 15:38:13 +0900
committerMichel Dänzer <michel@daenzer.net>2015-12-01 15:38:30 +0900
commit78fbca095ae9887a2d3de48bb07975e2d1126e68 (patch)
treec92e5b23a783e92f1d2389e28c92cee3aec59473
parentb19417e2fddf4df725951aea5ad5e9558338f59e (diff)
Load fb module before glamoregl/shadow modules
Fixes unresolved symbols on some systems. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93105 Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/radeon_kms.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 8f84df25..d4597404 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -1136,6 +1136,10 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
goto fail;
}
+ /* Get ScreenInit function */
+ if (!xf86LoadSubModule(pScrn, "fb"))
+ return FALSE;
+
if (!RADEONPreInitAccel_KMS(pScrn)) goto fail;
radeon_drm_queue_init();
@@ -1314,9 +1318,6 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
/* Set display resolution */
xf86SetDpi(pScrn, 0, 0);
- /* Get ScreenInit function */
- if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-
if (!xf86SetGamma(pScrn, zeros)) return FALSE;
if (!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) {