Commit f7876ce6 authored by Ian Lepore's avatar Ian Lepore Committed by Adam Jackson

Honor Option "NoDDC" correctly

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=46541Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent 2cb98453
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment