Remove the riva128 submodule. Link Riva support into nv_drv.so directly.

3 files changed, 3 insertions, 76 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 73667b3..ecc8597 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,13 +45,7 @@ nv_drv_la_SOURCES = \
          nv_type.h \
          nvvga.h \
          nv_video.c \
-         nv_xaa.c
-
-riva128_la_LTLIBRARIES = riva128.la
-riva128_la_LDFLAGS = -module -avoid-version
-riva128_ladir = @moduledir@/drivers
-
-riva128_la_SOURCES = \
+         nv_xaa.c \
          riva_const.h \
          riva_cursor.c \
          riva_dac.c \
diff --git a/src/nv_driver.c b/src/nv_driver.c
index fc83770..8f40cfa 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -440,12 +440,6 @@ static const char *int10Symbols[] = {
     NULL
 };
 
-static const char *rivaSymbols[] = {
-   "RivaGetScrnInfoRec",
-   "RivaAvailableOptions",
-    NULL
-};
-
 
 #ifdef XFree86LOADER
 
@@ -558,7 +552,7 @@ nvSetup(pointer module, pointer opts, int *errmaj, int *errmin)
          * might refer to.
          */
         LoaderRefSymLists(vgahwSymbols, xaaSymbols, fbSymbols,
-                          ramdacSymbols, shadowSymbols, rivaSymbols,
+                          ramdacSymbols, shadowSymbols,
                           i2cSymbols, ddcSymbols, vbeSymbols,
                           fbdevHWSymbols, int10Symbols, NULL);
 
@@ -580,10 +574,7 @@ static const OptionInfoRec *
 NVAvailableOptions(int chipid, int busid)
 {
     if(chipid == 0x12D20018) {
-	if (!xf86LoadOneModule("riva128", NULL)) {
-	    return NULL;
-	} else
-	    return RivaAvailableOptions(chipid, busid);
+        return RivaAvailableOptions(chipid, busid);
     }
     
     return NVOptions;
@@ -769,10 +760,6 @@ NVProbe(DriverPtr drv, int flags)
 
         pPci = xf86GetPciInfoForEntity(usedChips[i]);
         if(pPci->vendor == PCI_VENDOR_NVIDIA_SGS) {
-            if (!xf86LoadDrvSubModule(drv, "riva128")) {
-                  continue;
-            }
-            xf86LoaderReqSymLists(rivaSymbols, NULL);
             if(RivaGetScrnInfoRec(NVPciChipsets, usedChips[i]))
                 foundScreen = TRUE;
         } else {
diff --git a/src/riva_driver.c b/src/riva_driver.c
index f07a726..c6b805c 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -115,15 +115,6 @@ static const char *ddcSymbols[] = {
     NULL
 };
 
-#ifdef XFree86LOADER
-static const char *vbeSymbols[] = {
-    "VBEInit",
-    "vbeFree",
-    "vbeDoEDID",
-    NULL
-};
-#endif
-
 static const char *i2cSymbols[] = {
     "xf86CreateI2CBusRec",
     "xf86I2CBusInit",
@@ -166,27 +157,6 @@ static const char *int10Symbols[] = {
 };
 
 
-#ifdef XFree86LOADER
-
-static MODULESETUPPROTO(rivaSetup);
-
-static XF86ModuleVersionInfo rivaVersRec =
-{
-    "riva",
-    MODULEVENDORSTRING,
-    MODINFOSTRING1,
-    MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
-    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
-    ABI_CLASS_VIDEODRV,                     /* This is a video driver */
-    ABI_VIDEODRV_VERSION,
-    MOD_CLASS_VIDEODRV,
-    {0,0,0,0}
-};
-
-_X_EXPORT XF86ModuleData riva128ModuleData = { &rivaVersRec, rivaSetup, NULL };
-#endif
-
 
 typedef enum {
     OPTION_SW_CURSOR,
@@ -253,30 +223,6 @@ RivaFreeRec(ScrnInfoPtr pScrn)
     pScrn->driverPrivate = NULL;
 }
 
-
-#ifdef XFree86LOADER
-
-static pointer
-rivaSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
-    static Bool setupDone = FALSE;
-
-    /* This module should be loaded only once, but check to be sure. */
-
-    if (!setupDone) {
-        setupDone = TRUE;
-
-        LoaderRefSymLists(vgahwSymbols, xaaSymbols, fbSymbols,
-                          ramdacSymbols, shadowSymbols,
-                          i2cSymbols, ddcSymbols, vbeSymbols,
-                          fbdevHWSymbols, int10Symbols, NULL);
-    } 
-    return (pointer)1;
-}
-
-
-#endif /* XFree86LOADER */
-
 _X_EXPORT const OptionInfoRec *
 RivaAvailableOptions(int chipid, int busid)
 {