[PATCH xf86-video-r128 5/8] Remove R128ProbeDDC

[Kevin Brace]

This removes a VBE (VESA BIOS Extension) related call when probing.

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

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 5c526f7..b29b191 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1213,20 +1213,6 @@ static Bool R128PreInitControllers(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
     return !!found;
 }
 
-static void
-R128ProbeDDC(ScrnInfoPtr pScrn, int indx)
-{
-    vbeInfoPtr pVbe;
-
-#if !defined(__powerpc__) && !defined(__alpha__) && !defined(__sparc__)
-    if (xf86LoadSubModule(pScrn, "vbe")) {
-	pVbe = VBEInit(NULL,indx);
-	ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
-	vbeFree(pVbe);
-    }
-#endif
-}
-
 static Bool R128CRTCResize(ScrnInfoPtr pScrn, int width, int height)
 {
     pScrn->virtualX = width;
@@ -1246,6 +1232,10 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
 
     R128TRACE(("R128PreInit\n"));
 
+    if (flags & PROBE_DETECT) {
+        return TRUE;
+    }
+
     pScrn->monitor = pScrn->confScreen->monitor;
 
     if (!R128PreInitVisual(pScrn)) {
@@ -1267,11 +1257,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
     info->pEnt          = xf86GetEntityInfo(pScrn->entityList[0]);
     if (info->pEnt->location.type != BUS_PCI) goto fail;
 
-    if (flags & PROBE_DETECT) {
-	R128ProbeDDC(pScrn, info->pEnt->index);
-	return TRUE;
-    }
-
     info->PciInfo       = xf86GetPciInfoForEntity(info->pEnt->index);
 
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-- 
2.7.4