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-19 11:49:35 +0900
commita05ea868f940b9649ead2333108d69619b9003bf (patch)
tree837c240741bd8514d65ed760ad52ba5ff4689adc
parent7729b29b0a76c3e2eacfcb02abcbe115948b2937 (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> (cherry picked from commit a37746ffceaed83e48e48fb05439be7e020dd2ea)
-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 c257941..dcecf86 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -783,6 +783,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;
@@ -868,10 +872,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;