diff options
| author | Kevin Brace <kevinbrace@gmx.com> | 2018-06-26 17:40:11 -0500 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@gmx.com> | 2018-07-09 15:33:53 -0700 |
| commit | 16822a6a31731cb457ab35b79e5cd6f04c060625 (patch) | |
| tree | 8ecc4c57f2393c7d4c0305aec2fbe6430fbb0a2c | |
| parent | c4c878d2ccb75fa75afe46e0e50ee9975c5c57fc (diff) | |
Move the location R128PreInitDRI is called
Merge it into R128LegacyMS function.
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
| -rw-r--r-- | src/r128_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c index 87395a7..c272a30 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1242,6 +1242,10 @@ static Bool R128LegacyMS(ScrnInfoPtr pScrn) if (!R128PreInitControllers(pScrn, pInt10)) goto freeInt10; +#ifdef R128DRI + if (!R128PreInitDRI(pScrn)) goto freeInt10; +#endif + ret = TRUE; freeInt10: /* Free int10 info */ @@ -1402,10 +1406,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) if (!R128PreInitCursor(pScrn)) goto fail; -#ifdef R128DRI - if (!R128PreInitDRI(pScrn)) goto fail; -#endif - info->CurrentLayout.displayWidth = pScrn->displayWidth; if (!xf86RandR12PreInit(pScrn)) { |