Update of /cvsroot/linux-vax/kernel-2.4/drivers/char/drm
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/char/drm
Modified Files:
Config.in Makefile drm.h drm_context.h
Log Message:
DA: sync with Marcelo 2.4.17
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/drm/Config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config.in 11 Apr 2002 13:30:59 -0000 1.2
+++ Config.in 10 Jun 2003 01:13:28 -0000 1.3
@@ -13,4 +13,5 @@
dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP
dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
+ dep_tristate ' SiS' CONFIG_DRM_SIS $CONFIG_AGP
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/drm/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 11 Apr 2002 13:30:59 -0000 1.2
+++ Makefile 10 Jun 2003 01:13:28 -0000 1.3
@@ -3,7 +3,7 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
O_TARGET := drm.o
-list-multi := gamma.o tdfx.o r128.o mga.o i810.o radeon.o ffb.o
+list-multi := gamma.o tdfx.o r128.o mga.o i810.o radeon.o ffb.o sis.o
gamma-objs := gamma_drv.o gamma_dma.o
tdfx-objs := tdfx_drv.o
@@ -12,6 +12,7 @@
i810-objs := i810_drv.o i810_dma.o
radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o
ffb-objs := ffb_drv.o ffb_context.o
+sis-objs := sis_drv.o sis_ds.o sis_mm.o
obj-$(CONFIG_DRM_GAMMA) += gamma.o
obj-$(CONFIG_DRM_TDFX) += tdfx.o
@@ -20,6 +21,7 @@
obj-$(CONFIG_DRM_MGA) += mga.o
obj-$(CONFIG_DRM_I810) += i810.o
obj-$(CONFIG_DRM_FFB) += ffb.o
+obj-$(CONFIG_DRM_SIS) += sis.o
include $(TOPDIR)/Rules.make
@@ -43,3 +45,6 @@
ffb.o: $(ffb-objs) $(lib)
$(LD) -r -o $@ $(ffb-objs) $(lib)
+
+sis.o: $(sis-objs) $(lib)
+ $(LD) -r -o $@ $(sis-objs) $(lib)
Index: drm.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/drm/drm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- drm.h 11 Apr 2002 13:30:59 -0000 1.2
+++ drm.h 10 Jun 2003 01:13:28 -0000 1.3
@@ -104,7 +104,7 @@
#include "i810_drm.h"
#include "r128_drm.h"
#include "radeon_drm.h"
-#ifdef CONFIG_DRM_SIS
+#if defined(CONFIG_DRM_SIS) || defined(CONFIG_DRM_SIS_MODULE)
#include "sis_drm.h"
#endif
@@ -483,7 +483,7 @@
#define DRM_IOCTL_RADEON_INDIRECT DRM_IOWR(0x4d, drm_radeon_indirect_t)
#define DRM_IOCTL_RADEON_TEXTURE DRM_IOWR(0x4e, drm_radeon_texture_t)
-#ifdef CONFIG_DRM_SIS
+#if defined(CONFIG_DRM_SIS) || defined(CONFIG_DRM_SIS_MODULE)
/* SiS specific ioctls */
#define SIS_IOCTL_FB_ALLOC DRM_IOWR(0x44, drm_sis_mem_t)
#define SIS_IOCTL_FB_FREE DRM_IOW( 0x45, drm_sis_mem_t)
Index: drm_context.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/char/drm/drm_context.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drm_context.h 11 Apr 2002 13:31:00 -0000 1.1
+++ drm_context.h 10 Jun 2003 01:13:28 -0000 1.2
@@ -27,6 +27,10 @@
* Authors:
* Rickard E. (Rik) Faith <fa...@va...>
* Gareth Hughes <ga...@va...>
+ * ChangeLog:
+ * 2001-11-16 Torsten Duwe <du...@ca...>
+ * added context constructor/destructor hooks,
+ * needed by SiS driver's memory management.
*/
#define __NO_VERSION__
@@ -316,6 +320,10 @@
/* Should this return -EBUSY instead? */
return -ENOMEM;
}
+#ifdef DRIVER_CTX_CTOR
+ if ( ctx.handle != DRM_KERNEL_CONTEXT )
+ DRIVER_CTX_CTOR(ctx.handle); /* XXX: also pass dev ? */
+#endif
if ( copy_to_user( (drm_ctx_t *)arg, &ctx, sizeof(ctx) ) )
return -EFAULT;
@@ -390,6 +398,9 @@
priv->remove_auth_on_close = 1;
}
if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
+#ifdef DRIVER_CTX_DTOR
+ DRIVER_CTX_DTOR(ctx.handle); /* XXX: also pass dev ? */
+#endif
DRM(ctxbitmap_free)( dev, ctx.handle );
}
|
