[PATCH xf86-video-r128] Move RAMDAC module initialization into R128LegacyMS

Kevin Brace kevinbrace at gmx.com
Fri Jul 27 03:04:28 UTC 2018


Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
---
 src/r128_driver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 6c1a9e9..773038c 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -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)) {
-- 
2.7.4



More information about the xorg-driver-ati mailing list