summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/vesa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/vesa.c b/src/vesa.c
index 2d3c10d..2300f4e 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -724,6 +724,9 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
xf86SetGamma(pScrn, gzeros);
+ /* set up options before loading any modules that may look at them */
+ xf86CollectOptions(pScrn, NULL);
+
if (pVesa->major >= 2) {
/* Load ddc module */
if ((pDDCModule = xf86LoadSubModule(pScrn, "ddc")) == NULL) {
@@ -834,7 +837,6 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags)
}
/* options */
- xf86CollectOptions(pScrn, NULL);
if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) {
vbeFree(pVesa->pVbe);
return FALSE;