diff options
author | Kevin Brace <kevinbrace@gmx.com> | 2019-12-23 11:00:34 -0600 |
---|---|---|
committer | Kevin Brace <kevinbrace@gmx.com> | 2019-12-23 11:00:34 -0600 |
commit | 3838058ae1409bc698ccdb69380c01a20cd1746a (patch) | |
tree | 4a74168258c2a74e776d59046802128daf6cb8fc /src | |
parent | 9bb3ef1493621dfb879bebf9bdee05e21d17d986 (diff) |
Tweak how DDX options are processed
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/via_driver.c | 2 | ||||
-rw-r--r-- | src/via_driver.h | 1 | ||||
-rw-r--r-- | src/via_options.c | 11 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/via_driver.c b/src/via_driver.c index 34f4130..da93ddb 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -1110,6 +1110,8 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags) option = xf86NewOption(strEXAOptionName, strEXAValue); xf86CollectOptions(pScrn, option); + viaSetupDefaultOptions(pScrn); + viaProcessOptions(pScrn); VIAVidHWDiffInit(pScrn); diff --git a/src/via_driver.h b/src/via_driver.h index 920d9e2..6da2f59 100644 --- a/src/via_driver.h +++ b/src/via_driver.h @@ -357,6 +357,7 @@ typedef struct const OptionInfoRec *VIAAvailableOptions(int chipid, int busid); +void viaSetupDefaultOptions(ScrnInfoPtr pScrn); void viaProcessOptions(ScrnInfoPtr pScrn); /* In via_display.c. */ diff --git a/src/via_options.c b/src/via_options.c index f0bdd39..8a17eae 100644 --- a/src/via_options.c +++ b/src/via_options.c @@ -97,14 +97,13 @@ VIAAvailableOptions(int chipid, int busid) } -static void +void viaSetupDefaultOptions(ScrnInfoPtr pScrn) { VIAPtr pVia = VIAPTR(pScrn); DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "%s - Setting up default chipset options.\n", - __func__)); + "Entered %s.\n", __func__)); pVia->shadowFB = FALSE; pVia->NoAccel = FALSE; @@ -181,6 +180,9 @@ viaSetupDefaultOptions(ScrnInfoPtr pScrn) pVia->dmaXV = FALSE; break; } + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting %s.\n", __func__)); } void @@ -194,7 +196,8 @@ viaProcessOptions(ScrnInfoPtr pScrn) DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Entered %s.\n", __func__)); - viaSetupDefaultOptions(pScrn); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Processing DDX options . . .\n"); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, VIAOptions); |