Move RAMDAC module initialization into R128LegacyMS

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
This commit is contained in:
Kevin Brace
2018-07-26 19:58:06 -07:00
parent f54469efca
commit c4c05c95ae

View File

@@ -1031,7 +1031,7 @@ static Bool R128PreInitCursor(ScrnInfoPtr pScrn)
{
R128InfoPtr info = R128PTR(pScrn);
if (!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) {
if (!info->swCursor) {
if (!xf86LoadSubModule(pScrn, "ramdac")) return FALSE;
}
return TRUE;
@@ -1303,6 +1303,8 @@ static Bool R128LegacyMS(ScrnInfoPtr pScrn)
xf86CrtcSetSizeRange(pScrn, 320, 200, 4096, 4096);
if (!R128PreInitCursor(pScrn)) goto freeInt10;
/* Don't fail on this one */
info->DDC = R128PreInitDDC(pScrn, pInt10);
@@ -1465,8 +1467,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
/* Get ScreenInit function */
if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
if (!R128PreInitCursor(pScrn)) goto fail;
info->CurrentLayout.displayWidth = pScrn->displayWidth;
if (!xf86RandR12PreInit(pScrn)) {