2,3c2
< * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw *
< */
---
> * Created: Mon Jan 4 10:05:05 1999 by sclin@sis.com.tw */
14c13
< *
---
> *
18c17
< *
---
> *
26c25
< *
---
> *
29,30c28,29
< *
< * $FreeBSD: head/sys/dev/drm/sis_mm.c 139839 2005-01-07 07:08:33Z scottl $
---
> *
> * $FreeBSD: head/sys/dev/drm/sis_mm.c 145132 2005-04-16 03:44:47Z anholt $
33,37d31
< #include "dev/drm/sis.h"
< #include "dev/drm/drmP.h"
< #include "dev/drm/sis_drm.h"
< #include "dev/drm/sis_drv.h"
< #include "dev/drm/sis_ds.h"
44a39,42
> #include "dev/drm/drmP.h"
> #include "dev/drm/sis_drm.h"
> #include "dev/drm/sis_drv.h"
> #include "dev/drm/sis_ds.h"
47c45
< #define VIDEO_TYPE 0
---
> #define VIDEO_TYPE 0
53c51
< set_t *sets[2]; /* 0 for video, 1 for AGP */
---
> set_t *sets[2]; /* 0 for video, 1 for AGP */
58d55
<
62c59
<
---
>
64,65c61
< if (global_ppriv[i].used && global_ppriv[i].context == context)
< {
---
> if (global_ppriv[i].used && global_ppriv[i].context == context) {
74c70
< {
---
> {
78,79c74
< if (global_ppriv[i].used && global_ppriv[i].context == context)
< {
---
> if (global_ppriv[i].used && global_ppriv[i].context == context) {
87c82
< /* fb management via fb device */
---
> /* fb management via fb device */
90c85
< int sis_fb_init( DRM_IOCTL_ARGS )
---
> static int sis_fb_init(DRM_IOCTL_ARGS)
95c90
< int sis_fb_alloc( DRM_IOCTL_ARGS )
---
> static int sis_fb_alloc(DRM_IOCTL_ARGS)
98a94
> drm_sis_mem_t __user *argp = (void __user *)data;
101c97
< DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
---
> DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
114c110
< } else {
---
> } else {
120c116
< DRM_COPY_TO_USER_IOCTL((drm_sis_mem_t *)data, fb, sizeof(fb));
---
> DRM_COPY_TO_USER_IOCTL(argp, fb, sizeof(fb));
127c123
< int sis_fb_free( DRM_IOCTL_ARGS )
---
> static int sis_fb_free(DRM_IOCTL_ARGS)
132c128
< DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
---
> DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *) data, sizeof(fb));
158c154
< int sis_fb_init( DRM_IOCTL_ARGS )
---
> static int sis_fb_init(DRM_IOCTL_ARGS)
164c160
< DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t *)data, sizeof(fb));
---
> DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t __user *) data, sizeof(fb));
167,168c163,164
< dev->dev_private = DRM(calloc)(1, sizeof(drm_sis_private_t),
< DRM_MEM_DRIVER);
---
> dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
> DRM_MEM_DRIVER);
184c180
< int sis_fb_alloc( DRM_IOCTL_ARGS )
---
> static int sis_fb_alloc(DRM_IOCTL_ARGS)
187a184
> drm_sis_mem_t __user *argp = (void __user *)data;
194,196c191,193
<
< DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
<
---
>
> DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
>
204c201
< mmFreeMem((PMemBlock)fb.free);
---
> mmFreeMem((PMemBlock) fb.free);
213c210
< DRM_COPY_TO_USER_IOCTL((drm_sis_mem_t *)data, fb, sizeof(fb));
---
> DRM_COPY_TO_USER_IOCTL(argp, fb, sizeof(fb));
220c217
< int sis_fb_free( DRM_IOCTL_ARGS )
---
> static int sis_fb_free(DRM_IOCTL_ARGS)
229c226
< DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
---
> DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *) data, sizeof(fb));
231c228
< if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock)fb.free))
---
> if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock) fb.free))
236c233
< mmFreeMem((PMemBlock)fb.free);
---
> mmFreeMem((PMemBlock) fb.free);
245c242
< /* agp memory management */
---
> /* agp memory management */
247c244
< int sis_ioctl_agp_init( DRM_IOCTL_ARGS )
---
> static int sis_ioctl_agp_init(DRM_IOCTL_ARGS)
254,255c251,252
< dev->dev_private = DRM(calloc)(1, sizeof(drm_sis_private_t),
< DRM_MEM_DRIVER);
---
> dev->dev_private = drm_calloc(1, sizeof(drm_sis_private_t),
> DRM_MEM_DRIVER);
264c261,262
< DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t *)data, sizeof(agp));
---
> DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t __user *) data,
> sizeof(agp));
269c267
<
---
>
273c271
< int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS )
---
> static int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS)
276a275
> drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *)data;
280c279
<
---
>
283,285c282,284
<
< DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t *)data, sizeof(agp));
<
---
>
> DRM_COPY_FROM_USER_IOCTL(agp, argp, sizeof(agp));
>
293c292
< mmFreeMem((PMemBlock)agp.free);
---
> mmFreeMem((PMemBlock) agp.free);
296c295
< } else {
---
> } else {
302c301
< DRM_COPY_TO_USER_IOCTL((drm_sis_mem_t *)data, agp, sizeof(agp));
---
> DRM_COPY_TO_USER_IOCTL(argp, agp, sizeof(agp));
309c308
< int sis_ioctl_agp_free( DRM_IOCTL_ARGS )
---
> static int sis_ioctl_agp_free(DRM_IOCTL_ARGS)
318c317,318
< DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t *)data, sizeof(agp));
---
> DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t __user *) data,
> sizeof(agp));
320c320
< if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock)agp.free))
---
> if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock) agp.free))
323c323
< mmFreeMem((PMemBlock)agp.free);
---
> mmFreeMem((PMemBlock) agp.free);
332c332
< int sis_init_context(int context)
---
> int sis_init_context(struct drm_device *dev, int context)
336c336
< for (i = 0; i < MAX_CONTEXT ; i++) {
---
> for (i = 0; i < MAX_CONTEXT; i++) {
343c343
< for (i = 0; i < MAX_CONTEXT ; i++) {
---
> for (i = 0; i < MAX_CONTEXT; i++) {
350c350
< "context = %d\n", i, context);
---
> "context = %d\n", i, context);
355,356c355
< (global_ppriv[i].sets[1] == NULL))
< {
---
> (global_ppriv[i].sets[1] == NULL)) {
360c359
<
---
>
364c363
< int sis_final_context(int context)
---
> int sis_final_context(struct drm_device *dev, int context)
368c367
< for (i=0; i<MAX_CONTEXT; i++) {
---
> for (i = 0; i < MAX_CONTEXT; i++) {
389c388
< mmFreeMem((PMemBlock)item);
---
> mmFreeMem((PMemBlock) item);
400c399
< mmFreeMem((PMemBlock)item);
---
> mmFreeMem((PMemBlock) item);
405,407c404,406
< global_ppriv[i].used = 0;
< }
<
---
> global_ppriv[i].used = 0;
> }
>
409a409,419
>
> drm_ioctl_desc_t sis_ioctls[] = {
> [DRM_IOCTL_NR(DRM_SIS_FB_ALLOC)] = {sis_fb_alloc, 1, 0},
> [DRM_IOCTL_NR(DRM_SIS_FB_FREE)] = {sis_fb_free, 1, 0},
> [DRM_IOCTL_NR(DRM_SIS_AGP_INIT)] = {sis_ioctl_agp_init, 1, 1},
> [DRM_IOCTL_NR(DRM_SIS_AGP_ALLOC)] = {sis_ioctl_agp_alloc, 1, 0},
> [DRM_IOCTL_NR(DRM_SIS_AGP_FREE)] = {sis_ioctl_agp_free, 1, 0},
> [DRM_IOCTL_NR(DRM_SIS_FB_INIT)] = {sis_fb_init, 1, 1}
> };
>
> int sis_max_ioctl = DRM_ARRAY_SIZE(sis_ioctls);