37c37
< __FBSDID("$FreeBSD: head/sys/dev/drm/mga_state.c 152909 2005-11-28 23:13:57Z anholt $");
---
> __FBSDID("$FreeBSD: head/sys/dev/drm/mga_state.c 182080 2008-08-23 20:59:12Z rnoland $");
49c49
< drm_clip_rect_t * box)
---
> struct drm_clip_rect * box)
68,69c68
< MGA_YTOP, box->y1 * pitch,
< MGA_YBOT, (box->y2 - 1) * pitch);
---
> MGA_YTOP, box->y1 * pitch, MGA_YBOT, (box->y2 - 1) * pitch);
84,85c83
< MGA_PLNWT, ctx->plnwt,
< MGA_DWGCTL, ctx->dwgctl);
---
> MGA_PLNWT, ctx->plnwt, MGA_DWGCTL, ctx->dwgctl);
89,90c87
< MGA_WFLAG, ctx->wflag,
< MGA_ZORG, dev_priv->depth_offset);
---
> MGA_WFLAG, ctx->wflag, MGA_ZORG, dev_priv->depth_offset);
94,95c91
< MGA_DMAPAD, 0x00000000,
< MGA_DMAPAD, 0x00000000);
---
> MGA_DMAPAD, 0x00000000, MGA_DMAPAD, 0x00000000);
168,169c164,165
< /* printk("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
< /* tex->texctl, tex->texctl2); */
---
> /* printk("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
> /* tex->texctl, tex->texctl2); */
212,213c208,209
< /* printk("mga_g400_emit_tex1 %x %x %x\n", tex->texorg, */
< /* tex->texctl, tex->texctl2); */
---
> /* printk("mga_g400_emit_tex1 %x %x %x\n", tex->texorg, */
> /* tex->texctl, tex->texctl2); */
282c278
< /* printk("mga_g400_emit_pipe %x\n", pipe); */
---
> /* printk("mga_g400_emit_pipe %x\n", pipe); */
422c418
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
441c437
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
483c479
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
489c485
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
501c497
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
510c506
< static void mga_dma_dispatch_clear(drm_device_t * dev, drm_mga_clear_t * clear)
---
> static void mga_dma_dispatch_clear(struct drm_device * dev, drm_mga_clear_t * clear)
515c511
< drm_clip_rect_t *pbox = sarea_priv->boxes;
---
> struct drm_clip_rect *pbox = sarea_priv->boxes;
531c527
< drm_clip_rect_t *box = &pbox[i];
---
> struct drm_clip_rect *box = &pbox[i];
600c596
< static void mga_dma_dispatch_swap(drm_device_t * dev)
---
> static void mga_dma_dispatch_swap(struct drm_device * dev)
605c601
< drm_clip_rect_t *pbox = sarea_priv->boxes;
---
> struct drm_clip_rect *pbox = sarea_priv->boxes;
632c628
< drm_clip_rect_t *box = &pbox[i];
---
> struct drm_clip_rect *box = &pbox[i];
654c650
< DRM_DEBUG("%s... done.\n", __FUNCTION__);
---
> DRM_DEBUG("... done.\n");
657c653
< static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf)
---
> static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
666c662
< DRM_DEBUG("vertex: buf=%d used=%d\n", buf->idx, buf->used);
---
> DRM_DEBUG("buf=%d used=%d\n", buf->idx, buf->used);
704c700
< static void mga_dma_dispatch_indices(drm_device_t * dev, drm_buf_t * buf,
---
> static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * buf,
713c709
< DRM_DEBUG("indices: buf=%d start=%d end=%d\n", buf->idx, start, end);
---
> DRM_DEBUG("buf=%d start=%d end=%d\n", buf->idx, start, end);
753c749
< static void mga_dma_dispatch_iload(drm_device_t * dev, drm_buf_t * buf,
---
> static void mga_dma_dispatch_iload(struct drm_device * dev, struct drm_buf * buf,
806c802
< static void mga_dma_dispatch_blit(drm_device_t * dev, drm_mga_blit_t * blit)
---
> static void mga_dma_dispatch_blit(struct drm_device * dev, drm_mga_blit_t * blit)
811c807
< drm_clip_rect_t *pbox = sarea_priv->boxes;
---
> struct drm_clip_rect *pbox = sarea_priv->boxes;
871c867
< static int mga_dma_clear(DRM_IOCTL_ARGS)
---
> static int mga_dma_clear(struct drm_device *dev, void *data, struct drm_file *file_priv)
873d868
< DRM_DEVICE;
876c871
< drm_mga_clear_t clear;
---
> drm_mga_clear_t *clear = data;
878c873
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
880,882d874
< DRM_COPY_FROM_USER_IOCTL(clear, (drm_mga_clear_t __user *) data,
< sizeof(clear));
<
888c880
< mga_dma_dispatch_clear(dev, &clear);
---
> mga_dma_dispatch_clear(dev, clear);
897c889
< static int mga_dma_swap(DRM_IOCTL_ARGS)
---
> static int mga_dma_swap(struct drm_device *dev, void *data, struct drm_file *file_priv)
899d890
< DRM_DEVICE;
903c894
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
919c910
< static int mga_dma_vertex(DRM_IOCTL_ARGS)
---
> static int mga_dma_vertex(struct drm_device *dev, void *data, struct drm_file *file_priv)
921d911
< DRM_DEVICE;
923,924c913,914
< drm_device_dma_t *dma = dev->dma;
< drm_buf_t *buf;
---
> struct drm_device_dma *dma = dev->dma;
> struct drm_buf *buf;
926c916
< drm_mga_vertex_t vertex;
---
> drm_mga_vertex_t *vertex = data;
928c918
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
930,936c920,922
< DRM_COPY_FROM_USER_IOCTL(vertex,
< (drm_mga_vertex_t __user *) data,
< sizeof(vertex));
<
< if (vertex.idx < 0 || vertex.idx > dma->buf_count)
< return DRM_ERR(EINVAL);
< buf = dma->buflist[vertex.idx];
---
> if (vertex->idx < 0 || vertex->idx > dma->buf_count)
> return -EINVAL;
> buf = dma->buflist[vertex->idx];
939,940c925,926
< buf->used = vertex.used;
< buf_priv->discard = vertex.discard;
---
> buf->used = vertex->used;
> buf_priv->discard = vertex->discard;
943c929
< if (vertex.discard) {
---
> if (vertex->discard) {
949c935
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
959c945
< static int mga_dma_indices(DRM_IOCTL_ARGS)
---
> static int mga_dma_indices(struct drm_device *dev, void *data, struct drm_file *file_priv)
961d946
< DRM_DEVICE;
963,964c948,949
< drm_device_dma_t *dma = dev->dma;
< drm_buf_t *buf;
---
> struct drm_device_dma *dma = dev->dma;
> struct drm_buf *buf;
966c951
< drm_mga_indices_t indices;
---
> drm_mga_indices_t *indices = data;
968c953
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
970,972c955,956
< DRM_COPY_FROM_USER_IOCTL(indices,
< (drm_mga_indices_t __user *) data,
< sizeof(indices));
---
> if (indices->idx < 0 || indices->idx > dma->buf_count)
> return -EINVAL;
974,977c958
< if (indices.idx < 0 || indices.idx > dma->buf_count)
< return DRM_ERR(EINVAL);
<
< buf = dma->buflist[indices.idx];
---
> buf = dma->buflist[indices->idx];
980c961
< buf_priv->discard = indices.discard;
---
> buf_priv->discard = indices->discard;
983c964
< if (indices.discard) {
---
> if (indices->discard) {
989c970
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
994c975
< mga_dma_dispatch_indices(dev, buf, indices.start, indices.end);
---
> mga_dma_dispatch_indices(dev, buf, indices->start, indices->end);
999c980
< static int mga_dma_iload(DRM_IOCTL_ARGS)
---
> static int mga_dma_iload(struct drm_device *dev, void *data, struct drm_file *file_priv)
1001,1002c982
< DRM_DEVICE;
< drm_device_dma_t *dma = dev->dma;
---
> struct drm_device_dma *dma = dev->dma;
1004c984
< drm_buf_t *buf;
---
> struct drm_buf *buf;
1006c986
< drm_mga_iload_t iload;
---
> drm_mga_iload_t *iload = data;
1009c989
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
1011,1013d990
< DRM_COPY_FROM_USER_IOCTL(iload, (drm_mga_iload_t __user *) data,
< sizeof(iload));
<
1017,1018c994,995
< DRM_INFO("%s: -EBUSY\n", __FUNCTION__);
< return DRM_ERR(EBUSY);
---
> DRM_INFO("-EBUSY\n");
> return -EBUSY;
1021,1022c998,999
< if (iload.idx < 0 || iload.idx > dma->buf_count)
< return DRM_ERR(EINVAL);
---
> if (iload->idx < 0 || iload->idx > dma->buf_count)
> return -EINVAL;
1024c1001
< buf = dma->buflist[iload.idx];
---
> buf = dma->buflist[iload->idx];
1027c1004
< if (mga_verify_iload(dev_priv, iload.dstorg, iload.length)) {
---
> if (mga_verify_iload(dev_priv, iload->dstorg, iload->length)) {
1029c1006
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
1034c1011
< mga_dma_dispatch_iload(dev, buf, iload.dstorg, iload.length);
---
> mga_dma_dispatch_iload(dev, buf, iload->dstorg, iload->length);
1043c1020
< static int mga_dma_blit(DRM_IOCTL_ARGS)
---
> static int mga_dma_blit(struct drm_device *dev, void *data, struct drm_file *file_priv)
1045d1021
< DRM_DEVICE;
1048c1024
< drm_mga_blit_t blit;
---
> drm_mga_blit_t *blit = data;
1051c1027
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
1053,1055d1028
< DRM_COPY_FROM_USER_IOCTL(blit, (drm_mga_blit_t __user *) data,
< sizeof(blit));
<
1059,1060c1032,1033
< if (mga_verify_blit(dev_priv, blit.srcorg, blit.dstorg))
< return DRM_ERR(EINVAL);
---
> if (mga_verify_blit(dev_priv, blit->srcorg, blit->dstorg))
> return -EINVAL;
1064c1037
< mga_dma_dispatch_blit(dev, &blit);
---
> mga_dma_dispatch_blit(dev, blit);
1073c1046
< static int mga_getparam(DRM_IOCTL_ARGS)
---
> static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv)
1075d1047
< DRM_DEVICE;
1077c1049
< drm_mga_getparam_t param;
---
> drm_mga_getparam_t *param = data;
1081,1082c1053,1054
< DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
< return DRM_ERR(EINVAL);
---
> DRM_ERROR("called with no initialization\n");
> return -EINVAL;
1085,1087d1056
< DRM_COPY_FROM_USER_IOCTL(param, (drm_mga_getparam_t __user *) data,
< sizeof(param));
<
1090c1059
< switch (param.param) {
---
> switch (param->param) {
1098c1067
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
1101c1070
< if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
---
> if (DRM_COPY_TO_USER(param->value, &value, sizeof(int))) {
1103c1072
< return DRM_ERR(EFAULT);
---
> return -EFAULT;
1109c1078
< static int mga_set_fence(DRM_IOCTL_ARGS)
---
> static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *file_priv)
1111d1079
< DRM_DEVICE;
1113c1081
< u32 temp;
---
> u32 *fence = data;
1117,1118c1085,1086
< DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
< return DRM_ERR(EINVAL);
---
> DRM_ERROR("called with no initialization\n");
> return -EINVAL;
1123c1091
< /* I would normal do this assignment in the declaration of temp,
---
> /* I would normal do this assignment in the declaration of fence,
1127c1095
< temp = dev_priv->next_fence_to_post;
---
> *fence = dev_priv->next_fence_to_post;
1137,1138d1104
< DRM_COPY_TO_USER_IOCTL((u32 __user *)data, temp, sizeof(u32));
<
1142c1108
< static int mga_wait_fence(DRM_IOCTL_ARGS)
---
> static int mga_wait_fence(struct drm_device *dev, void *data, struct drm_file *file_priv)
1144d1109
< DRM_DEVICE;
1146c1111
< u32 fence;
---
> u32 *fence = data;
1149,1150c1114,1115
< DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
< return DRM_ERR(EINVAL);
---
> DRM_ERROR("called with no initialization\n");
> return -EINVAL;
1153,1154d1117
< DRM_COPY_FROM_USER_IOCTL(fence, (u32 __user *) data, sizeof(u32));
<
1157c1120
< mga_driver_fence_wait(dev, & fence);
---
> mga_driver_fence_wait(dev, fence);
1159,1160d1121
< DRM_COPY_TO_USER_IOCTL((u32 __user *)data, fence, sizeof(u32));
<
1164,1177c1125,1138
< drm_ioctl_desc_t mga_ioctls[] = {
< [DRM_IOCTL_NR(DRM_MGA_INIT)] = {mga_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
< [DRM_IOCTL_NR(DRM_MGA_FLUSH)] = {mga_dma_flush, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_RESET)] = {mga_dma_reset, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_SWAP)] = {mga_dma_swap, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_CLEAR)] = {mga_dma_clear, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_VERTEX)] = {mga_dma_vertex, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_INDICES)] = {mga_dma_indices, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_ILOAD)] = {mga_dma_iload, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_BLIT)] = {mga_dma_blit, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_GETPARAM)] = {mga_getparam, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_SET_FENCE)] = {mga_set_fence, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_WAIT_FENCE)] = {mga_wait_fence, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_DMA_BOOTSTRAP)] = {mga_dma_bootstrap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
---
> struct drm_ioctl_desc mga_ioctls[] = {
> DRM_IOCTL_DEF(DRM_MGA_INIT, mga_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF(DRM_MGA_FLUSH, mga_dma_flush, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_RESET, mga_dma_reset, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_SWAP, mga_dma_swap, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_CLEAR, mga_dma_clear, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_VERTEX, mga_dma_vertex, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_INDICES, mga_dma_indices, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_ILOAD, mga_dma_iload, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_BLIT, mga_dma_blit, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_GETPARAM, mga_getparam, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_SET_FENCE, mga_set_fence, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_WAIT_FENCE, mga_wait_fence, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_DMA_BOOTSTRAP, mga_dma_bootstrap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
< __FBSDID("$FreeBSD: head/sys/dev/drm/mga_state.c 152909 2005-11-28 23:13:57Z anholt $");
---
> __FBSDID("$FreeBSD: head/sys/dev/drm/mga_state.c 182080 2008-08-23 20:59:12Z rnoland $");
49c49
< drm_clip_rect_t * box)
---
> struct drm_clip_rect * box)
68,69c68
< MGA_YTOP, box->y1 * pitch,
< MGA_YBOT, (box->y2 - 1) * pitch);
---
> MGA_YTOP, box->y1 * pitch, MGA_YBOT, (box->y2 - 1) * pitch);
84,85c83
< MGA_PLNWT, ctx->plnwt,
< MGA_DWGCTL, ctx->dwgctl);
---
> MGA_PLNWT, ctx->plnwt, MGA_DWGCTL, ctx->dwgctl);
89,90c87
< MGA_WFLAG, ctx->wflag,
< MGA_ZORG, dev_priv->depth_offset);
---
> MGA_WFLAG, ctx->wflag, MGA_ZORG, dev_priv->depth_offset);
94,95c91
< MGA_DMAPAD, 0x00000000,
< MGA_DMAPAD, 0x00000000);
---
> MGA_DMAPAD, 0x00000000, MGA_DMAPAD, 0x00000000);
168,169c164,165
< /* printk("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
< /* tex->texctl, tex->texctl2); */
---
> /* printk("mga_g400_emit_tex0 %x %x %x\n", tex->texorg, */
> /* tex->texctl, tex->texctl2); */
212,213c208,209
< /* printk("mga_g400_emit_tex1 %x %x %x\n", tex->texorg, */
< /* tex->texctl, tex->texctl2); */
---
> /* printk("mga_g400_emit_tex1 %x %x %x\n", tex->texorg, */
> /* tex->texctl, tex->texctl2); */
282c278
< /* printk("mga_g400_emit_pipe %x\n", pipe); */
---
> /* printk("mga_g400_emit_pipe %x\n", pipe); */
422c418
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
441c437
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
483c479
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
489c485
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
501c497
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
510c506
< static void mga_dma_dispatch_clear(drm_device_t * dev, drm_mga_clear_t * clear)
---
> static void mga_dma_dispatch_clear(struct drm_device * dev, drm_mga_clear_t * clear)
515c511
< drm_clip_rect_t *pbox = sarea_priv->boxes;
---
> struct drm_clip_rect *pbox = sarea_priv->boxes;
531c527
< drm_clip_rect_t *box = &pbox[i];
---
> struct drm_clip_rect *box = &pbox[i];
600c596
< static void mga_dma_dispatch_swap(drm_device_t * dev)
---
> static void mga_dma_dispatch_swap(struct drm_device * dev)
605c601
< drm_clip_rect_t *pbox = sarea_priv->boxes;
---
> struct drm_clip_rect *pbox = sarea_priv->boxes;
632c628
< drm_clip_rect_t *box = &pbox[i];
---
> struct drm_clip_rect *box = &pbox[i];
654c650
< DRM_DEBUG("%s... done.\n", __FUNCTION__);
---
> DRM_DEBUG("... done.\n");
657c653
< static void mga_dma_dispatch_vertex(drm_device_t * dev, drm_buf_t * buf)
---
> static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
666c662
< DRM_DEBUG("vertex: buf=%d used=%d\n", buf->idx, buf->used);
---
> DRM_DEBUG("buf=%d used=%d\n", buf->idx, buf->used);
704c700
< static void mga_dma_dispatch_indices(drm_device_t * dev, drm_buf_t * buf,
---
> static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * buf,
713c709
< DRM_DEBUG("indices: buf=%d start=%d end=%d\n", buf->idx, start, end);
---
> DRM_DEBUG("buf=%d start=%d end=%d\n", buf->idx, start, end);
753c749
< static void mga_dma_dispatch_iload(drm_device_t * dev, drm_buf_t * buf,
---
> static void mga_dma_dispatch_iload(struct drm_device * dev, struct drm_buf * buf,
806c802
< static void mga_dma_dispatch_blit(drm_device_t * dev, drm_mga_blit_t * blit)
---
> static void mga_dma_dispatch_blit(struct drm_device * dev, drm_mga_blit_t * blit)
811c807
< drm_clip_rect_t *pbox = sarea_priv->boxes;
---
> struct drm_clip_rect *pbox = sarea_priv->boxes;
871c867
< static int mga_dma_clear(DRM_IOCTL_ARGS)
---
> static int mga_dma_clear(struct drm_device *dev, void *data, struct drm_file *file_priv)
873d868
< DRM_DEVICE;
876c871
< drm_mga_clear_t clear;
---
> drm_mga_clear_t *clear = data;
878c873
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
880,882d874
< DRM_COPY_FROM_USER_IOCTL(clear, (drm_mga_clear_t __user *) data,
< sizeof(clear));
<
888c880
< mga_dma_dispatch_clear(dev, &clear);
---
> mga_dma_dispatch_clear(dev, clear);
897c889
< static int mga_dma_swap(DRM_IOCTL_ARGS)
---
> static int mga_dma_swap(struct drm_device *dev, void *data, struct drm_file *file_priv)
899d890
< DRM_DEVICE;
903c894
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
919c910
< static int mga_dma_vertex(DRM_IOCTL_ARGS)
---
> static int mga_dma_vertex(struct drm_device *dev, void *data, struct drm_file *file_priv)
921d911
< DRM_DEVICE;
923,924c913,914
< drm_device_dma_t *dma = dev->dma;
< drm_buf_t *buf;
---
> struct drm_device_dma *dma = dev->dma;
> struct drm_buf *buf;
926c916
< drm_mga_vertex_t vertex;
---
> drm_mga_vertex_t *vertex = data;
928c918
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
930,936c920,922
< DRM_COPY_FROM_USER_IOCTL(vertex,
< (drm_mga_vertex_t __user *) data,
< sizeof(vertex));
<
< if (vertex.idx < 0 || vertex.idx > dma->buf_count)
< return DRM_ERR(EINVAL);
< buf = dma->buflist[vertex.idx];
---
> if (vertex->idx < 0 || vertex->idx > dma->buf_count)
> return -EINVAL;
> buf = dma->buflist[vertex->idx];
939,940c925,926
< buf->used = vertex.used;
< buf_priv->discard = vertex.discard;
---
> buf->used = vertex->used;
> buf_priv->discard = vertex->discard;
943c929
< if (vertex.discard) {
---
> if (vertex->discard) {
949c935
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
959c945
< static int mga_dma_indices(DRM_IOCTL_ARGS)
---
> static int mga_dma_indices(struct drm_device *dev, void *data, struct drm_file *file_priv)
961d946
< DRM_DEVICE;
963,964c948,949
< drm_device_dma_t *dma = dev->dma;
< drm_buf_t *buf;
---
> struct drm_device_dma *dma = dev->dma;
> struct drm_buf *buf;
966c951
< drm_mga_indices_t indices;
---
> drm_mga_indices_t *indices = data;
968c953
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
970,972c955,956
< DRM_COPY_FROM_USER_IOCTL(indices,
< (drm_mga_indices_t __user *) data,
< sizeof(indices));
---
> if (indices->idx < 0 || indices->idx > dma->buf_count)
> return -EINVAL;
974,977c958
< if (indices.idx < 0 || indices.idx > dma->buf_count)
< return DRM_ERR(EINVAL);
<
< buf = dma->buflist[indices.idx];
---
> buf = dma->buflist[indices->idx];
980c961
< buf_priv->discard = indices.discard;
---
> buf_priv->discard = indices->discard;
983c964
< if (indices.discard) {
---
> if (indices->discard) {
989c970
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
994c975
< mga_dma_dispatch_indices(dev, buf, indices.start, indices.end);
---
> mga_dma_dispatch_indices(dev, buf, indices->start, indices->end);
999c980
< static int mga_dma_iload(DRM_IOCTL_ARGS)
---
> static int mga_dma_iload(struct drm_device *dev, void *data, struct drm_file *file_priv)
1001,1002c982
< DRM_DEVICE;
< drm_device_dma_t *dma = dev->dma;
---
> struct drm_device_dma *dma = dev->dma;
1004c984
< drm_buf_t *buf;
---
> struct drm_buf *buf;
1006c986
< drm_mga_iload_t iload;
---
> drm_mga_iload_t *iload = data;
1009c989
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
1011,1013d990
< DRM_COPY_FROM_USER_IOCTL(iload, (drm_mga_iload_t __user *) data,
< sizeof(iload));
<
1017,1018c994,995
< DRM_INFO("%s: -EBUSY\n", __FUNCTION__);
< return DRM_ERR(EBUSY);
---
> DRM_INFO("-EBUSY\n");
> return -EBUSY;
1021,1022c998,999
< if (iload.idx < 0 || iload.idx > dma->buf_count)
< return DRM_ERR(EINVAL);
---
> if (iload->idx < 0 || iload->idx > dma->buf_count)
> return -EINVAL;
1024c1001
< buf = dma->buflist[iload.idx];
---
> buf = dma->buflist[iload->idx];
1027c1004
< if (mga_verify_iload(dev_priv, iload.dstorg, iload.length)) {
---
> if (mga_verify_iload(dev_priv, iload->dstorg, iload->length)) {
1029c1006
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
1034c1011
< mga_dma_dispatch_iload(dev, buf, iload.dstorg, iload.length);
---
> mga_dma_dispatch_iload(dev, buf, iload->dstorg, iload->length);
1043c1020
< static int mga_dma_blit(DRM_IOCTL_ARGS)
---
> static int mga_dma_blit(struct drm_device *dev, void *data, struct drm_file *file_priv)
1045d1021
< DRM_DEVICE;
1048c1024
< drm_mga_blit_t blit;
---
> drm_mga_blit_t *blit = data;
1051c1027
< LOCK_TEST_WITH_RETURN(dev, filp);
---
> LOCK_TEST_WITH_RETURN(dev, file_priv);
1053,1055d1028
< DRM_COPY_FROM_USER_IOCTL(blit, (drm_mga_blit_t __user *) data,
< sizeof(blit));
<
1059,1060c1032,1033
< if (mga_verify_blit(dev_priv, blit.srcorg, blit.dstorg))
< return DRM_ERR(EINVAL);
---
> if (mga_verify_blit(dev_priv, blit->srcorg, blit->dstorg))
> return -EINVAL;
1064c1037
< mga_dma_dispatch_blit(dev, &blit);
---
> mga_dma_dispatch_blit(dev, blit);
1073c1046
< static int mga_getparam(DRM_IOCTL_ARGS)
---
> static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv)
1075d1047
< DRM_DEVICE;
1077c1049
< drm_mga_getparam_t param;
---
> drm_mga_getparam_t *param = data;
1081,1082c1053,1054
< DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
< return DRM_ERR(EINVAL);
---
> DRM_ERROR("called with no initialization\n");
> return -EINVAL;
1085,1087d1056
< DRM_COPY_FROM_USER_IOCTL(param, (drm_mga_getparam_t __user *) data,
< sizeof(param));
<
1090c1059
< switch (param.param) {
---
> switch (param->param) {
1098c1067
< return DRM_ERR(EINVAL);
---
> return -EINVAL;
1101c1070
< if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
---
> if (DRM_COPY_TO_USER(param->value, &value, sizeof(int))) {
1103c1072
< return DRM_ERR(EFAULT);
---
> return -EFAULT;
1109c1078
< static int mga_set_fence(DRM_IOCTL_ARGS)
---
> static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *file_priv)
1111d1079
< DRM_DEVICE;
1113c1081
< u32 temp;
---
> u32 *fence = data;
1117,1118c1085,1086
< DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
< return DRM_ERR(EINVAL);
---
> DRM_ERROR("called with no initialization\n");
> return -EINVAL;
1123c1091
< /* I would normal do this assignment in the declaration of temp,
---
> /* I would normal do this assignment in the declaration of fence,
1127c1095
< temp = dev_priv->next_fence_to_post;
---
> *fence = dev_priv->next_fence_to_post;
1137,1138d1104
< DRM_COPY_TO_USER_IOCTL((u32 __user *)data, temp, sizeof(u32));
<
1142c1108
< static int mga_wait_fence(DRM_IOCTL_ARGS)
---
> static int mga_wait_fence(struct drm_device *dev, void *data, struct drm_file *file_priv)
1144d1109
< DRM_DEVICE;
1146c1111
< u32 fence;
---
> u32 *fence = data;
1149,1150c1114,1115
< DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
< return DRM_ERR(EINVAL);
---
> DRM_ERROR("called with no initialization\n");
> return -EINVAL;
1153,1154d1117
< DRM_COPY_FROM_USER_IOCTL(fence, (u32 __user *) data, sizeof(u32));
<
1157c1120
< mga_driver_fence_wait(dev, & fence);
---
> mga_driver_fence_wait(dev, fence);
1159,1160d1121
< DRM_COPY_TO_USER_IOCTL((u32 __user *)data, fence, sizeof(u32));
<
1164,1177c1125,1138
< drm_ioctl_desc_t mga_ioctls[] = {
< [DRM_IOCTL_NR(DRM_MGA_INIT)] = {mga_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
< [DRM_IOCTL_NR(DRM_MGA_FLUSH)] = {mga_dma_flush, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_RESET)] = {mga_dma_reset, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_SWAP)] = {mga_dma_swap, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_CLEAR)] = {mga_dma_clear, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_VERTEX)] = {mga_dma_vertex, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_INDICES)] = {mga_dma_indices, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_ILOAD)] = {mga_dma_iload, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_BLIT)] = {mga_dma_blit, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_GETPARAM)] = {mga_getparam, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_SET_FENCE)] = {mga_set_fence, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_WAIT_FENCE)] = {mga_wait_fence, DRM_AUTH},
< [DRM_IOCTL_NR(DRM_MGA_DMA_BOOTSTRAP)] = {mga_dma_bootstrap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
---
> struct drm_ioctl_desc mga_ioctls[] = {
> DRM_IOCTL_DEF(DRM_MGA_INIT, mga_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF(DRM_MGA_FLUSH, mga_dma_flush, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_RESET, mga_dma_reset, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_SWAP, mga_dma_swap, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_CLEAR, mga_dma_clear, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_VERTEX, mga_dma_vertex, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_INDICES, mga_dma_indices, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_ILOAD, mga_dma_iload, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_BLIT, mga_dma_blit, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_GETPARAM, mga_getparam, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_SET_FENCE, mga_set_fence, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_WAIT_FENCE, mga_wait_fence, DRM_AUTH),
> DRM_IOCTL_DEF(DRM_MGA_DMA_BOOTSTRAP, mga_dma_bootstrap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),