geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixups for kernel build: EXPORT_SYMTAB warning removal 

put_module_symbol clean up of tdfx tdfx_cleanup routine Makefile.kernel
    fix
main
Rik Faith 2000-07-20 05:17:49 +00:00
parent 0bd1fa795a
commit b4722ec943
14 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-core/Makefile.kernel
View File

@ -66,7 +66,7 @@ ifeq ($(CONFIG_DRM_R128),y)
OX_OBJS += r128_drv.o OX_OBJS += r128_drv.o
O_OBJS += r128_context.o r128_bufs.o r128_dma.o O_OBJS += r128_context.o r128_bufs.o r128_dma.o
else else
ifeq ($(CONFIG_DRM_I810),m) ifeq ($(CONFIG_DRM_R128),m)
MIX_OBJS += r128_drv.o MIX_OBJS += r128_drv.o
MI_OBJS += r128_context.o r128_bufs.o r128_dma.o MI_OBJS += r128_context.o r128_bufs.o r128_dma.o
M_OBJS += r128.o M_OBJS += r128.o
@ -102,7 +102,7 @@ i810.o: i810_drv.o i810_context.o i810_bufs.o i810_dma.o $(L_OBJS)
$(LD) $(LD_RFLAG) -r -o $@ i810_drv.o i810_bufs.o i810_dma.o \ $(LD) $(LD_RFLAG) -r -o $@ i810_drv.o i810_bufs.o i810_dma.o \
i810_context.o $(L_OBJS) i810_context.o $(L_OBJS)
r128.o: r128_drv.o r128_context.o r128_bufs.o $(L_OBJS) r128.o: r128_drv.o r128_context.o r128_bufs.o r128_dma.o $(L_OBJS)
$(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_bufs.o r128_dma.o \ $(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_bufs.o r128_dma.o \
r128_context.o $(L_OBJS) r128_context.o $(L_OBJS)

1
linux-core/drmP.h
View File

@ -728,6 +728,7 @@ extern void drm_ctxbitmap_free(drm_device_t *dev, int ctx_handle);
#ifdef DRM_AGP #ifdef DRM_AGP
/* AGP/GART support (agpsupport.c) */ /* AGP/GART support (agpsupport.c) */
extern drm_agp_head_t *drm_agp_init(void); extern drm_agp_head_t *drm_agp_init(void);
extern void drm_agp_uninit(void);
extern int drm_agp_acquire(struct inode *inode, struct file *filp, extern int drm_agp_acquire(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
extern int drm_agp_release(struct inode *inode, struct file *filp, extern int drm_agp_release(struct inode *inode, struct file *filp,

3
linux-core/i810_drv.c
View File

@ -30,7 +30,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "i810_drv.h" #include "i810_drv.h"
@ -420,6 +422,7 @@ void i810_cleanup(void)
drm_ctxbitmap_cleanup(dev); drm_ctxbitmap_cleanup(dev);
i810_takedown(dev); i810_takedown(dev);
if (dev->agp) { if (dev->agp) {
drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL; dev->agp = NULL;
} }

3
linux-core/mga_drv.c
View File

@ -31,7 +31,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "mga_drv.h" #include "mga_drv.h"
EXPORT_SYMBOL(mga_init); EXPORT_SYMBOL(mga_init);
@ -434,6 +436,7 @@ void mga_cleanup(void)
mga_takedown(dev); mga_takedown(dev);
if (dev->agp) { if (dev->agp) {
drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL; dev->agp = NULL;
} }

4
linux-core/r128_drv.c
View File

@ -30,7 +30,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "r128_drv.h" #include "r128_drv.h"
EXPORT_SYMBOL(r128_init); EXPORT_SYMBOL(r128_init);
@ -409,7 +411,7 @@ void r128_cleanup(void)
r128_takedown(dev); r128_takedown(dev);
#ifdef DRM_AGP #ifdef DRM_AGP
if (dev->agp) { if (dev->agp) {
/* FIXME -- free other information, too */ drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL; dev->agp = NULL;
} }

11
linux-core/tdfx_drv.c
View File

@ -31,7 +31,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "tdfx_drv.h" #include "tdfx_drv.h"
EXPORT_SYMBOL(tdfx_init); EXPORT_SYMBOL(tdfx_init);
@ -242,8 +244,6 @@ static int tdfx_takedown(drm_device_t *dev)
temp = temp_next; temp = temp_next;
} }
if (dev->agp->acquired) (*drm_agp.release)(); if (dev->agp->acquired) (*drm_agp.release)();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL;
} }
#endif #endif
/* Clear vma list (only built for debugging) */ /* Clear vma list (only built for debugging) */
@ -368,6 +368,13 @@ void tdfx_cleanup(void)
} }
drm_ctxbitmap_cleanup(dev); drm_ctxbitmap_cleanup(dev);
tdfx_takedown(dev); tdfx_takedown(dev);
#ifdef DRM_AGP
if (dev->agp) {
drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL;
}
#endif
} }
int tdfx_version(struct inode *inode, struct file *filp, unsigned int cmd, int tdfx_version(struct inode *inode, struct file *filp, unsigned int cmd,

4
linux/Makefile.kernel
View File

@ -66,7 +66,7 @@ ifeq ($(CONFIG_DRM_R128),y)
OX_OBJS += r128_drv.o OX_OBJS += r128_drv.o
O_OBJS += r128_context.o r128_bufs.o r128_dma.o O_OBJS += r128_context.o r128_bufs.o r128_dma.o
else else
ifeq ($(CONFIG_DRM_I810),m) ifeq ($(CONFIG_DRM_R128),m)
MIX_OBJS += r128_drv.o MIX_OBJS += r128_drv.o
MI_OBJS += r128_context.o r128_bufs.o r128_dma.o MI_OBJS += r128_context.o r128_bufs.o r128_dma.o
M_OBJS += r128.o M_OBJS += r128.o
@ -102,7 +102,7 @@ i810.o: i810_drv.o i810_context.o i810_bufs.o i810_dma.o $(L_OBJS)
$(LD) $(LD_RFLAG) -r -o $@ i810_drv.o i810_bufs.o i810_dma.o \ $(LD) $(LD_RFLAG) -r -o $@ i810_drv.o i810_bufs.o i810_dma.o \
i810_context.o $(L_OBJS) i810_context.o $(L_OBJS)
r128.o: r128_drv.o r128_context.o r128_bufs.o $(L_OBJS) r128.o: r128_drv.o r128_context.o r128_bufs.o r128_dma.o $(L_OBJS)
$(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_bufs.o r128_dma.o \ $(LD) $(LD_RFLAG) -r -o $@ r128_drv.o r128_bufs.o r128_dma.o \
r128_context.o $(L_OBJS) r128_context.o $(L_OBJS)

12
linux/agpsupport.c
View File

@ -313,3 +313,15 @@ drm_agp_head_t *drm_agp_init(void)
} }
return head; return head;
} }
void drm_agp_uninit(void)
{
drm_agp_fill_t *fill;
for (fill = &drm_agp_fill[0]; fill->name; fill++) {
#if LINUX_VERSION_CODE >= 0x020400
if ((*fill->f).address) put_module_symbol((*fill->f).address);
#endif
(*fill->f).address = 0;
}
}

1
linux/drmP.h
View File

@ -728,6 +728,7 @@ extern void drm_ctxbitmap_free(drm_device_t *dev, int ctx_handle);
#ifdef DRM_AGP #ifdef DRM_AGP
/* AGP/GART support (agpsupport.c) */ /* AGP/GART support (agpsupport.c) */
extern drm_agp_head_t *drm_agp_init(void); extern drm_agp_head_t *drm_agp_init(void);
extern void drm_agp_uninit(void);
extern int drm_agp_acquire(struct inode *inode, struct file *filp, extern int drm_agp_acquire(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
extern int drm_agp_release(struct inode *inode, struct file *filp, extern int drm_agp_release(struct inode *inode, struct file *filp,

2
linux/gamma_drv.c
View File

@ -30,7 +30,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "gamma_drv.h" #include "gamma_drv.h"
#include <linux/pci.h> #include <linux/pci.h>

3
linux/i810_drv.c
View File

@ -30,7 +30,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "i810_drv.h" #include "i810_drv.h"
@ -420,6 +422,7 @@ void i810_cleanup(void)
drm_ctxbitmap_cleanup(dev); drm_ctxbitmap_cleanup(dev);
i810_takedown(dev); i810_takedown(dev);
if (dev->agp) { if (dev->agp) {
drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL; dev->agp = NULL;
} }

3
linux/mga_drv.c
View File

@ -31,7 +31,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "mga_drv.h" #include "mga_drv.h"
EXPORT_SYMBOL(mga_init); EXPORT_SYMBOL(mga_init);
@ -434,6 +436,7 @@ void mga_cleanup(void)
mga_takedown(dev); mga_takedown(dev);
if (dev->agp) { if (dev->agp) {
drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL; dev->agp = NULL;
} }

4
linux/r128_drv.c
View File

@ -30,7 +30,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "r128_drv.h" #include "r128_drv.h"
EXPORT_SYMBOL(r128_init); EXPORT_SYMBOL(r128_init);
@ -409,7 +411,7 @@ void r128_cleanup(void)
r128_takedown(dev); r128_takedown(dev);
#ifdef DRM_AGP #ifdef DRM_AGP
if (dev->agp) { if (dev->agp) {
/* FIXME -- free other information, too */ drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL; dev->agp = NULL;
} }

11
linux/tdfx_drv.c
View File

@ -31,7 +31,9 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#ifndef EXPORT_SYMTAB
#define EXPORT_SYMTAB #define EXPORT_SYMTAB
#endif
#include "drmP.h" #include "drmP.h"
#include "tdfx_drv.h" #include "tdfx_drv.h"
EXPORT_SYMBOL(tdfx_init); EXPORT_SYMBOL(tdfx_init);
@ -242,8 +244,6 @@ static int tdfx_takedown(drm_device_t *dev)
temp = temp_next; temp = temp_next;
} }
if (dev->agp->acquired) (*drm_agp.release)(); if (dev->agp->acquired) (*drm_agp.release)();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL;
} }
#endif #endif
/* Clear vma list (only built for debugging) */ /* Clear vma list (only built for debugging) */
@ -368,6 +368,13 @@ void tdfx_cleanup(void)
} }
drm_ctxbitmap_cleanup(dev); drm_ctxbitmap_cleanup(dev);
tdfx_takedown(dev); tdfx_takedown(dev);
#ifdef DRM_AGP
if (dev->agp) {
drm_agp_uninit();
drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
dev->agp = NULL;
}
#endif
} }
int tdfx_version(struct inode *inode, struct file *filp, unsigned int cmd, int tdfx_version(struct inode *inode, struct file *filp, unsigned int cmd,