summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-02-15 18:35:54 +0900
committerMichel Dänzer <michel@daenzer.net>2016-02-16 16:33:14 +0900
commita37746ffceaed83e48e48fb05439be7e020dd2ea (patch)
treece2264c51b84a073fa917b4bbc953ccd2e859d77
parent59c0a6807110eca829c6708e16585a38f39a5c17 (diff)
Load fb module before glamoregl/shadow modules
Fixes unresolved symbols on some systems. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93105 (ported from radeon commit 78fbca095ae9887a2d3de48bb07975e2d1126e68) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/amdgpu_kms.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index c466362..7bbef32 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -798,6 +798,10 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
goto fail;
}
+ /* Get ScreenInit function */
+ if (!xf86LoadSubModule(pScrn, "fb"))
+ return FALSE;
+
if (!AMDGPUPreInitAccel_KMS(pScrn))
goto fail;
@@ -883,10 +887,6 @@ Bool AMDGPUPreInit_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;