summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin Brace <kevinbrace@gmx.com>2019-12-23 10:25:15 -0600
committerKevin Brace <kevinbrace@gmx.com>2019-12-23 10:25:15 -0600
commit9bb3ef1493621dfb879bebf9bdee05e21d17d986 (patch)
treeed1d73238bb1c9c4b8d7094a9281df4e2d300115 /src
parentcbd54a975d9c53fe11c5ce3810a0ceb5d7a8cf33 (diff)
Move up configuration setup before calling umsPreInit()
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'src')
-rw-r--r--src/via_driver.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/via_driver.c b/src/via_driver.c
index a4fade4..34f4130 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1107,6 +1107,13 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
}
#endif
+ option = xf86NewOption(strEXAOptionName, strEXAValue);
+ xf86CollectOptions(pScrn, option);
+
+ viaProcessOptions(pScrn);
+
+ VIAVidHWDiffInit(pScrn);
+
/* After umsPreInit function succeeds, PCI hardware resources are
* memory mapped. If there is an error from this point on, they will
* need to be explicitly relinquished. */
@@ -1117,13 +1124,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
}
}
- option = xf86NewOption(strEXAOptionName, strEXAValue);
- xf86CollectOptions(pScrn, option);
-
- viaProcessOptions(pScrn);
-
- VIAVidHWDiffInit(pScrn);
-
/* CRTC handling */
xf86CrtcConfigInit(pScrn, &via_xf86crtc_config_funcs);