diff options
| author | Ian Lepore <freebsd-xorg@damnhippie.dyndns.org> | 2018-01-31 10:48:09 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-02-15 14:27:25 -0500 |
| commit | f7876ce62c751c9b28d5750e1d01def877e666fb (patch) | |
| tree | 0dcf5e40e57849f3b7814d5ab79c078fe8c2fefd | |
| parent | 2cb984533fd7a36151bb8be18a63f678a552ad71 (diff) | |
| download | xorg-driver-xf86-video-vesa-f7876ce62c751c9b28d5750e1d01def877e666fb.tar.gz | |
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=46541
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/vesa.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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; |