projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b816802)
Added version string to the end of the kernel module name. This allows
authorJeff Hartmann <jhartmann@valinux.com>
Mon, 16 Jul 2001 22:42:36 +0000 (22:42 +0000)
committerJeff Hartmann <jhartmann@valinux.com>
Mon, 16 Jul 2001 22:42:36 +0000 (22:42 +0000)
    multiple versions of the kernel module to co-exist on one machine.

17 files changed:
linux-core/i810_drv.c patch | blob | history
linux-core/mga_drv.c patch | blob | history
linux-core/r128_drv.c patch | blob | history
linux-core/radeon_drv.c patch | blob | history
linux-core/sis_drv.c patch | blob | history
linux-core/tdfx_drv.c patch | blob | history
linux/Makefile.linux patch | blob | history
linux/drm.h patch | blob | history
linux/gamma_drv.c patch | blob | history
linux/i810_drv.c patch | blob | history
linux/mga_drv.c patch | blob | history
linux/r128_drv.c patch | blob | history
linux/radeon_drv.c patch | blob | history
linux/sis_drv.c patch | blob | history
linux/tdfx_drv.c patch | blob | history
shared-core/drm.h patch | blob | history
shared/drm.h patch | blob | history

diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index 887170a..2775071 100644 (file)
--- a/linux-core/i810_drv.c
+++ b/linux-core/i810_drv.c
@@ -37,7 +37,7 @@
 
 #define DRIVER_AUTHOR          "VA Linux Systems Inc."
 
-#define DRIVER_NAME            "i810"
+#define DRIVER_NAME            "i810"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "Intel i810"
 #define DRIVER_DATE            "20010616"
 
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index bea65cf..0afda31 100644 (file)
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -36,7 +36,7 @@
 
 #define DRIVER_AUTHOR          "Gareth Hughes, VA Linux Systems Inc."
 
-#define DRIVER_NAME            "mga"
+#define DRIVER_NAME            "mga"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "Matrox G200/G400"
 #define DRIVER_DATE            "20010321"
 
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 584cb29..c520723 100644 (file)
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -37,7 +37,7 @@
 
 #define DRIVER_AUTHOR          "Gareth Hughes, VA Linux Systems Inc."
 
-#define DRIVER_NAME            "r128"
+#define DRIVER_NAME            "r128"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "ATI Rage 128"
 #define DRIVER_DATE            "20010405"
 
diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index d763266..3414507 100644 (file)
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -35,7 +35,7 @@
 
 #define DRIVER_AUTHOR          "Gareth Hughes, VA Linux Systems Inc."
 
-#define DRIVER_NAME            "radeon"
+#define DRIVER_NAME            "radeon"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "ATI Radeon"
 #define DRIVER_DATE            "20010405"
 
diff --git a/linux-core/sis_drv.c b/linux-core/sis_drv.c
index 3dd83fd..8701e00 100644 (file)
--- a/linux-core/sis_drv.c
+++ b/linux-core/sis_drv.c
@@ -32,7 +32,7 @@
 #include "sis_drv.h"
 
 #define DRIVER_AUTHOR   "SIS"
-#define DRIVER_NAME     "sis"
+#define DRIVER_NAME     "sis"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC     "SIS 300/630/540"
 #define DRIVER_DATE     "20010503"
 #define DRIVER_MAJOR    1
diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c
index f478395..e28518b 100644 (file)
--- a/linux-core/tdfx_drv.c
+++ b/linux-core/tdfx_drv.c
@@ -36,7 +36,7 @@
 
 #define DRIVER_AUTHOR          "VA Linux Systems Inc."
 
-#define DRIVER_NAME            "tdfx"
+#define DRIVER_NAME            "tdfx"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "3dfx Banshee/Voodoo3+"
 #define DRIVER_DATE            "20010216"
 
diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index cb48028..9aa523d 100644 (file)
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -47,7 +47,9 @@
 
 # **** End of SMP/MODVERSIONS detection
 
-MODS =         gamma.o tdfx.o r128.o radeon.o
+XFREE86VERSION =       4_1_0
+MODS =         gamma-$(XFREE86VERSION).o tdfx-$(XFREE86VERSION).o \
+               r128-$(XFREE86VERSION).o radeon-$(XFREE86VERSION).o
 LIBS =
 
 DRMTEMPLATES = drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \
@@ -146,12 +148,12 @@ ifeq ($(AGP),1)
 MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE
 DRMTEMPLATES += drm_agpsupport.h
 DRMHEADERS += agpsupport-pre24.h
-MODS += mga.o
+MODS += mga-$(XFREE86VERSION).o
 ifeq ($(MACHINE),i386)
-MODS += i810.o
+MODS += i810-$(XFREE86VERSION).o
 endif
 ifeq ($(MACHINE),i686)
-MODS += i810.o
+MODS += i810-$(XFREE86VERSION).o
 endif
 
 MGAOBJS =      mga_drv.o mga_dma.o mga_state.o mga_warp.o
@@ -221,36 +223,36 @@ DRIsetup: DRIsetup.c
 
 gamma_drv.o: gamma_drv.c
        $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-gamma.o: $(GAMMAOBJS)
+gamma-$(XFREE86VERSION).o: $(GAMMAOBJS)
        $(LD) -r $^ -o $@
 
 tdfx_drv.o: tdfx_drv.c
        $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-tdfx.o: $(TDFXOBJS) $(LIBS)
+tdfx-$(XFREE86VERSION).o: $(TDFXOBJS) $(LIBS)
        $(LD) -r $^ -o $@
 
-sis.o: $(SISOBJS) $(LIBS)
+sis-$(XFREE86VERSION).o: $(SISOBJS) $(LIBS)
        $(LD) -r $^ -o $@
 
 r128_drv.o: r128_drv.c
        $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-r128.o: $(R128OBJS) $(LIBS)
+r128-$(XFREE86VERSION).o: $(R128OBJS) $(LIBS)
        $(LD) -r $^ -o $@
 
 radeon_drv.o: radeon_drv.c
        $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-radeon.o: $(RADEONOBJS) $(LIBS)
+radeon-$(XFREE86VERSION).o: $(RADEONOBJS) $(LIBS)
        $(LD) -r $^ -o $@
 
 ifeq ($(AGP),1)
 mga_drv.o: mga_drv.c
        $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-mga.o: $(MGAOBJS)
+mga-$(XFREE86VERSION).o: $(MGAOBJS)
        $(LD) -r $^ -o $@
 
 i810_drv.o: i810_drv.c
        $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-i810.o: $(I810OBJS) $(LIBS)
+i810-$(XFREE86VERSION).o: $(I810OBJS) $(LIBS)
        $(LD) -r $^ -o $@
 
 endif
diff --git a/linux/drm.h b/linux/drm.h
index ac9f407..5faf2ba 100644 (file)
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -47,10 +47,26 @@
 #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"
diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c
index 98916bc..cd64b30 100644 (file)
--- a/linux/gamma_drv.c
+++ b/linux/gamma_drv.c
@@ -36,7 +36,7 @@
 
 #define DRIVER_AUTHOR          "VA Linux Systems Inc."
 
-#define DRIVER_NAME            "gamma"
+#define DRIVER_NAME            "gamma"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "3DLabs gamma"
 #define DRIVER_DATE            "20010216"
 
diff --git a/linux/i810_drv.c b/linux/i810_drv.c
index 887170a..2775071 100644 (file)
--- a/linux/i810_drv.c
+++ b/linux/i810_drv.c
@@ -37,7 +37,7 @@
 
 #define DRIVER_AUTHOR          "VA Linux Systems Inc."
 
-#define DRIVER_NAME            "i810"
+#define DRIVER_NAME            "i810"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "Intel i810"
 #define DRIVER_DATE            "20010616"
 
diff --git a/linux/mga_drv.c b/linux/mga_drv.c
index bea65cf..0afda31 100644 (file)
--- a/linux/mga_drv.c
+++ b/linux/mga_drv.c
@@ -36,7 +36,7 @@
 
 #define DRIVER_AUTHOR          "Gareth Hughes, VA Linux Systems Inc."
 
-#define DRIVER_NAME            "mga"
+#define DRIVER_NAME            "mga"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "Matrox G200/G400"
 #define DRIVER_DATE            "20010321"
 
diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index 584cb29..c520723 100644 (file)
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -37,7 +37,7 @@
 
 #define DRIVER_AUTHOR          "Gareth Hughes, VA Linux Systems Inc."
 
-#define DRIVER_NAME            "r128"
+#define DRIVER_NAME            "r128"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "ATI Rage 128"
 #define DRIVER_DATE            "20010405"
 
diff --git a/linux/radeon_drv.c b/linux/radeon_drv.c
index d763266..3414507 100644 (file)
--- a/linux/radeon_drv.c
+++ b/linux/radeon_drv.c
@@ -35,7 +35,7 @@
 
 #define DRIVER_AUTHOR          "Gareth Hughes, VA Linux Systems Inc."
 
-#define DRIVER_NAME            "radeon"
+#define DRIVER_NAME            "radeon"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "ATI Radeon"
 #define DRIVER_DATE            "20010405"
 
diff --git a/linux/sis_drv.c b/linux/sis_drv.c
index 3dd83fd..8701e00 100644 (file)
--- a/linux/sis_drv.c
+++ b/linux/sis_drv.c
@@ -32,7 +32,7 @@
 #include "sis_drv.h"
 
 #define DRIVER_AUTHOR   "SIS"
-#define DRIVER_NAME     "sis"
+#define DRIVER_NAME     "sis"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC     "SIS 300/630/540"
 #define DRIVER_DATE     "20010503"
 #define DRIVER_MAJOR    1
diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c
index f478395..e28518b 100644 (file)
--- a/linux/tdfx_drv.c
+++ b/linux/tdfx_drv.c
@@ -36,7 +36,7 @@
 
 #define DRIVER_AUTHOR          "VA Linux Systems Inc."
 
-#define DRIVER_NAME            "tdfx"
+#define DRIVER_NAME            "tdfx"##CONFIG_XFREE86_VERSION_STR
 #define DRIVER_DESC            "3dfx Banshee/Voodoo3+"
 #define DRIVER_DATE            "20010216"
 
diff --git a/shared-core/drm.h b/shared-core/drm.h
index ac9f407..5faf2ba 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -47,10 +47,26 @@
 #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"
diff --git a/shared/drm.h b/shared/drm.h
index ac9f407..5faf2ba 100644 (file)
--- a/shared/drm.h
+++ b/shared/drm.h
@@ -47,10 +47,26 @@
 #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"
Domain: System / Kernel;