From: Ian Lepore <[email protected]> Move xf86CollectOptions before the DDC code so it can actually hear us when we ask to disable DDC.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46541 Signed-off-by: Adam Jackson <[email protected]> --- src/vesa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- 2.14.3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
