#if !defined(XFree86Server)
return -1;
#else
+ char temp_name[256];
+ Bool kernel_loaded = FALSE;
+
+ sprintf(temp_name, "%s-%d_%d_%d", name,
+ XF86_VERSION_MAJOR,
+ XF86_VERSION_MINOR,
+ XF86_VERSION_PATCH);
+
+ /* first try and load the XF Version number of the module */
+ if (!xf86LoadKernelModule(temp_name)) {
+ ErrorF("[drm] failed to load kernel module \"%s\"\n",
+ temp_name);
+ ErrorF("[drm] falling back to older kernel modules\n");
+ } else {
+ kernel_loaded = TRUE;
+ }
+
+ /* When we have more releases, add logic here to attempt to load them
+ * here.
+ */
+
/* try to load the kernel module now */
- if (!xf86LoadKernelModule(name)) {
+ if (kernel_loaded == FALSE && !xf86LoadKernelModule(name)) {
ErrorF("[drm] failed to load kernel module \"%s\"\n",
name);
+ ErrorF("[drm] No suitable kernel module found.\n");
return -1;
}
#endif
#define DRIVER_AUTHOR "VA Linux Systems Inc."
-#define DRIVER_NAME "i810"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "i810"
#define DRIVER_DESC "Intel i810"
#define DRIVER_DATE "20010616"
#define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
-#define DRIVER_NAME "mga"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "mga"
#define DRIVER_DESC "Matrox G200/G400"
#define DRIVER_DATE "20010321"
#define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
-#define DRIVER_NAME "r128"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "r128"
#define DRIVER_DESC "ATI Rage 128"
#define DRIVER_DATE "20010405"
#define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
-#define DRIVER_NAME "radeon"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "radeon"
#define DRIVER_DESC "ATI Radeon"
#define DRIVER_DATE "20010405"
#include "sis_drv.h"
#define DRIVER_AUTHOR "SIS"
-#define DRIVER_NAME "sis"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "sis"
#define DRIVER_DESC "SIS 300/630/540"
#define DRIVER_DATE "20010503"
#define DRIVER_MAJOR 1
#define DRIVER_AUTHOR "VA Linux Systems Inc."
-#define DRIVER_NAME "tdfx"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "tdfx"
#define DRIVER_DESC "3dfx Banshee/Voodoo3+"
#define DRIVER_DATE "20010216"
# **** End of SMP/MODVERSIONS detection
XFREE86VERSION = 4_1_0
-MODS = gamma-$(XFREE86VERSION).o tdfx-$(XFREE86VERSION).o \
+MODS = gamma-$(XFREE86VERSION).o tdfx.o \
r128-$(XFREE86VERSION).o radeon-$(XFREE86VERSION).o
LIBS =
tdfx_drv.o: tdfx_drv.c
$(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-tdfx-$(XFREE86VERSION).o: $(TDFXOBJS) $(LIBS)
+tdfx.o: $(TDFXOBJS) $(LIBS)
$(LD) -r $^ -o $@
sis-$(XFREE86VERSION).o: $(SISOBJS) $(LIBS)
#define XFREE86_VERSION(major,minor,patch,snap) \
((major << 16) | (minor << 8) | patch)
-#define __DRM_STRINGIFY(x) #x
-#define DRM_STRINGIFY(x) __DRM_STRINGIFY(x)
-
#ifndef CONFIG_XFREE86_VERSION
-/* If CONFIG_XFREE86_VERSION is defined, these must also be defined */
-#define CONFIG_XFREE86_MAJOR 4
-#define CONFIG_XFREE86_MINOR 1
-#define CONFIG_XFREE86_PATCH 0
-
#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)
#endif
-#define XF86_MAJ_STR DRM_STRINGIFY(CONFIG_XFREE86_MAJOR)
-#define XF86_MIN_STR DRM_STRINGIFY(CONFIG_XFREE86_MINOR)
-#define XF86_PATCH_STR DRM_STRINGIFY(CONFIG_XFREE86_PATCH)
-
-#ifndef CONFIG_XFREE86_VERSION_STR
-#define CONFIG_XFREE86_VERSION_STR "-"##XF86_MAJ_STR##"_"##XF86_MIN_STR##"_"##XF86_PATCH_STR
-#endif
-
#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
#define DRM_PROC_DEVICES "/proc/devices"
#define DRM_PROC_MISC "/proc/misc"
#define DRIVER_AUTHOR "VA Linux Systems Inc."
-#define DRIVER_NAME "gamma"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "gamma"
#define DRIVER_DESC "3DLabs gamma"
#define DRIVER_DATE "20010216"
#define DRIVER_AUTHOR "VA Linux Systems Inc."
-#define DRIVER_NAME "i810"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "i810"
#define DRIVER_DESC "Intel i810"
#define DRIVER_DATE "20010616"
#define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
-#define DRIVER_NAME "mga"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "mga"
#define DRIVER_DESC "Matrox G200/G400"
#define DRIVER_DATE "20010321"
#define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
-#define DRIVER_NAME "r128"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "r128"
#define DRIVER_DESC "ATI Rage 128"
#define DRIVER_DATE "20010405"
#define DRIVER_AUTHOR "Gareth Hughes, VA Linux Systems Inc."
-#define DRIVER_NAME "radeon"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "radeon"
#define DRIVER_DESC "ATI Radeon"
#define DRIVER_DATE "20010405"
#include "sis_drv.h"
#define DRIVER_AUTHOR "SIS"
-#define DRIVER_NAME "sis"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "sis"
#define DRIVER_DESC "SIS 300/630/540"
#define DRIVER_DATE "20010503"
#define DRIVER_MAJOR 1
#define DRIVER_AUTHOR "VA Linux Systems Inc."
-#define DRIVER_NAME "tdfx"##CONFIG_XFREE86_VERSION_STR
+#define DRIVER_NAME "tdfx"
#define DRIVER_DESC "3dfx Banshee/Voodoo3+"
#define DRIVER_DATE "20010216"
#define XFREE86_VERSION(major,minor,patch,snap) \
((major << 16) | (minor << 8) | patch)
-#define __DRM_STRINGIFY(x) #x
-#define DRM_STRINGIFY(x) __DRM_STRINGIFY(x)
-
#ifndef CONFIG_XFREE86_VERSION
-/* If CONFIG_XFREE86_VERSION is defined, these must also be defined */
-#define CONFIG_XFREE86_MAJOR 4
-#define CONFIG_XFREE86_MINOR 1
-#define CONFIG_XFREE86_PATCH 0
-
#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)
#endif
-#define XF86_MAJ_STR DRM_STRINGIFY(CONFIG_XFREE86_MAJOR)
-#define XF86_MIN_STR DRM_STRINGIFY(CONFIG_XFREE86_MINOR)
-#define XF86_PATCH_STR DRM_STRINGIFY(CONFIG_XFREE86_PATCH)
-
-#ifndef CONFIG_XFREE86_VERSION_STR
-#define CONFIG_XFREE86_VERSION_STR "-"##XF86_MAJ_STR##"_"##XF86_MIN_STR##"_"##XF86_PATCH_STR
-#endif
-
#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
#define DRM_PROC_DEVICES "/proc/devices"
#define DRM_PROC_MISC "/proc/misc"
#define XFREE86_VERSION(major,minor,patch,snap) \
((major << 16) | (minor << 8) | patch)
-#define __DRM_STRINGIFY(x) #x
-#define DRM_STRINGIFY(x) __DRM_STRINGIFY(x)
-
#ifndef CONFIG_XFREE86_VERSION
-/* If CONFIG_XFREE86_VERSION is defined, these must also be defined */
-#define CONFIG_XFREE86_MAJOR 4
-#define CONFIG_XFREE86_MINOR 1
-#define CONFIG_XFREE86_PATCH 0
-
#define CONFIG_XFREE86_VERSION XFREE86_VERSION(4,1,0,0)
#endif
-#define XF86_MAJ_STR DRM_STRINGIFY(CONFIG_XFREE86_MAJOR)
-#define XF86_MIN_STR DRM_STRINGIFY(CONFIG_XFREE86_MINOR)
-#define XF86_PATCH_STR DRM_STRINGIFY(CONFIG_XFREE86_PATCH)
-
-#ifndef CONFIG_XFREE86_VERSION_STR
-#define CONFIG_XFREE86_VERSION_STR "-"##XF86_MAJ_STR##"_"##XF86_MIN_STR##"_"##XF86_PATCH_STR
-#endif
-
#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
#define DRM_PROC_DEVICES "/proc/devices"
#define DRM_PROC_MISC "/proc/misc"