fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-26 19:20:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add module version name at a lower layer of the code, allows things to be

Browse source 
more flexible and allow older module versions to still work. Might not
    be final code if we move over to DRI kernel module version, but will be
    if we use XFree86 version. + Only build tdfx.o instead of tdfx-4_1_0.o
    since tdfx.o has never changed its API.
This commit is contained in:
Jeff Hartmann 2001-07-18 21:02:58 +00:00
parent c6454e6a93
commit 4eafeec960
18 changed files with 38 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libdrm/xf86drm.c
View file

@ -285,10 +285,32 @@ static int drmOpenByName(const char *name)
#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

2
linux-core/i810_drv.c
View file

@ -37,7 +37,7 @@
#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"

2
linux-core/mga_drv.c
View file

@ -36,7 +36,7 @@
#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"

2
linux-core/r128_drv.c
View file

@ -37,7 +37,7 @@
#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"

2
linux-core/radeon_drv.c
View file

@ -35,7 +35,7 @@
#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"

2
linux-core/sis_drv.c
View file

@ -32,7 +32,7 @@
#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

2
linux-core/tdfx_drv.c
View file

@ -36,7 +36,7 @@
#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"

4
linux/Makefile.linux
View file

@ -48,7 +48,7 @@
# **** 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 =
@ -228,7 +228,7 @@ gamma-$(XFREE86VERSION).o: $(GAMMAOBJS)
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)

16
linux/drm.h
View file

@ -47,26 +47,10 @@
#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"

2
linux/gamma_drv.c
View file

@ -36,7 +36,7 @@
#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"

2
linux/i810_drv.c
View file

@ -37,7 +37,7 @@
#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"

2
linux/mga_drv.c
View file

@ -36,7 +36,7 @@
#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"

2
linux/r128_drv.c
View file

@ -37,7 +37,7 @@
#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"

2
linux/radeon_drv.c
View file

@ -35,7 +35,7 @@
#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"

2
linux/sis_drv.c
View file

@ -32,7 +32,7 @@
#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

2
linux/tdfx_drv.c
View file

@ -36,7 +36,7 @@
#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"

16
shared-core/drm.h
View file

@ -47,26 +47,10 @@
#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"

16
shared/drm.h
View file

@ -47,26 +47,10 @@
#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"