upcoming commit for the SiS driver.
#ifdef DRIVER_CTX_CTOR
if ( ctx.handle != DRM_KERNEL_CONTEXT )
- DRIVER_CTX_CTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_CTOR(dev, ctx.handle);
#endif
DRM_COPY_TO_USER_IOCTL( (drm_ctx_t *)data, ctx, sizeof(ctx) );
DRM_DEBUG( "%d\n", ctx.handle );
if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
#ifdef DRIVER_CTX_DTOR
- DRIVER_CTX_DTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_DTOR(dev, ctx.handle);
#endif
DRM(ctxbitmap_free)( dev, ctx.handle );
}
#ifdef DRIVER_CTX_CTOR
if ( ctx.handle != DRM_KERNEL_CONTEXT )
- DRIVER_CTX_CTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_CTOR(dev, ctx.handle);
#endif
DRM_COPY_TO_USER_IOCTL( (drm_ctx_t *)data, ctx, sizeof(ctx) );
DRM_DEBUG( "%d\n", ctx.handle );
if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
#ifdef DRIVER_CTX_DTOR
- DRIVER_CTX_DTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_DTOR(dev, ctx.handle);
#endif
DRM(ctxbitmap_free)( dev, ctx.handle );
}
}
#ifdef DRIVER_CTX_CTOR
if ( ctx.handle != DRM_KERNEL_CONTEXT )
- DRIVER_CTX_CTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_CTOR(dev, ctx.handle);
#endif
ctx_entry = DRM(alloc)( sizeof(*ctx_entry), DRM_MEM_CTXLIST );
if ( !ctx_entry ) {
}
if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
#ifdef DRIVER_CTX_DTOR
- DRIVER_CTX_DTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_DTOR(dev, ctx.handle);
#endif
DRM(ctxbitmap_free)( dev, ctx.handle );
}
}
#ifdef DRIVER_CTX_CTOR
if ( ctx.handle != DRM_KERNEL_CONTEXT )
- DRIVER_CTX_CTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_CTOR(dev, ctx.handle);
#endif
ctx_entry = DRM(alloc)( sizeof(*ctx_entry), DRM_MEM_CTXLIST );
if ( !ctx_entry ) {
}
if ( ctx.handle != DRM_KERNEL_CONTEXT ) {
#ifdef DRIVER_CTX_DTOR
- DRIVER_CTX_DTOR(ctx.handle); /* XXX: also pass dev ? */
+ DRIVER_CTX_DTOR(dev, ctx.handle);
#endif
DRM(ctxbitmap_free)( dev, ctx.handle );
}
extern int sis_ioctl_agp_free( DRM_IOCTL_ARGS );
extern int sis_fb_init( DRM_IOCTL_ARGS );
+extern int sis_init_context(drm_device_t *dev, int context);
+extern int sis_final_context(drm_device_t *dev, int context);
+
#endif
return 0;
}
-int sis_init_context(int context)
+int sis_init_context(drm_device_t *dev, int context)
{
int i;
return 1;
}
-int sis_final_context(int context)
+int sis_final_context(drm_device_t *dev, int context)
{
int i;
#define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg)
#define VIA_WRITE8(reg,val) DRM_WRITE8(VIA_BASE, reg, val)
-
+extern int via_init_context(drm_device_t *dev, int context);
+extern int via_final_context(drm_device_t *dev, int context);
+
extern int via_do_init_map(drm_device_t *dev, drm_via_init_t *init);
extern int via_do_cleanup_map(drm_device_t *dev);
extern int via_map_init(struct inode *inode, struct file *filp,
return 0;
}
-int via_init_context(int context)
+int via_init_context(drm_device_t *dev, int context)
{
int i;
return 1;
}
-int via_final_context(int context)
+int via_final_context(drm_device_t *dev, int context)
{
int i;
for (i=0; i<MAX_CONTEXT; i++)
#define DRIVER_AGP_BUFFERS_MAP( dev ) \
((drm_sis_private_t *)((dev)->dev_private))->buffers
-extern int sis_init_context(int context);
-extern int sis_final_context(int context);
-
#define DRIVER_CTX_CTOR sis_init_context
#define DRIVER_CTX_DTOR sis_final_context
extern int sis_ioctl_agp_free( DRM_IOCTL_ARGS );
extern int sis_fb_init( DRM_IOCTL_ARGS );
+extern int sis_init_context(drm_device_t *dev, int context);
+extern int sis_final_context(drm_device_t *dev, int context);
+
#endif
return 0;
}
-int sis_init_context(int context)
+int sis_init_context(drm_device_t *dev, int context)
{
int i;
return 1;
}
-int sis_final_context(int context)
+int sis_final_context(drm_device_t *dev, int context)
{
int i;
#define DRIVER_AGP_BUFFERS_MAP( dev ) \
((drm_via_private_t *)((dev)->dev_private))->buffers
-extern int via_init_context(int context);
-extern int via_final_context(int context);
-
#define DRIVER_CTX_CTOR via_init_context
#define DRIVER_CTX_DTOR via_final_context
#define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg)
#define VIA_WRITE8(reg,val) DRM_WRITE8(VIA_BASE, reg, val)
-
+extern int via_init_context(drm_device_t *dev, int context);
+extern int via_final_context(drm_device_t *dev, int context);
+
extern int via_do_init_map(drm_device_t *dev, drm_via_init_t *init);
extern int via_do_cleanup_map(drm_device_t *dev);
extern int via_map_init(struct inode *inode, struct file *filp,
return 0;
}
-int via_init_context(int context)
+int via_init_context(drm_device_t *dev, int context)
{
int i;
return 1;
}
-int via_final_context(int context)
+int via_final_context(drm_device_t *dev, int context)
{
int i;
for (i=0; i<MAX_CONTEXT; i++)