aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/i915_dma.c')
-rw-r--r--drivers/char/drm/i915_dma.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 9ba114657c5e..977c74857383 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -397,11 +397,11 @@ static int i915_emit_cmds(drm_device_t * dev, int __user * buffer, int dwords)
397} 397}
398 398
399static int i915_emit_box(drm_device_t * dev, 399static int i915_emit_box(drm_device_t * dev,
400 drm_clip_rect_t __user * boxes, 400 struct drm_clip_rect __user * boxes,
401 int i, int DR1, int DR4) 401 int i, int DR1, int DR4)
402{ 402{
403 drm_i915_private_t *dev_priv = dev->dev_private; 403 drm_i915_private_t *dev_priv = dev->dev_private;
404 drm_clip_rect_t box; 404 struct drm_clip_rect box;
405 RING_LOCALS; 405 RING_LOCALS;
406 406
407 if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) { 407 if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) {
@@ -493,7 +493,7 @@ static int i915_dispatch_batchbuffer(drm_device_t * dev,
493 drm_i915_batchbuffer_t * batch) 493 drm_i915_batchbuffer_t * batch)
494{ 494{
495 drm_i915_private_t *dev_priv = dev->dev_private; 495 drm_i915_private_t *dev_priv = dev->dev_private;
496 drm_clip_rect_t __user *boxes = batch->cliprects; 496 struct drm_clip_rect __user *boxes = batch->cliprects;
497 int nbox = batch->num_cliprects; 497 int nbox = batch->num_cliprects;
498 int i = 0, count; 498 int i = 0, count;
499 RING_LOCALS; 499 RING_LOCALS;
@@ -625,7 +625,7 @@ static int i915_batchbuffer(DRM_IOCTL_ARGS)
625 625
626 if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects, 626 if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects,
627 batch.num_cliprects * 627 batch.num_cliprects *
628 sizeof(drm_clip_rect_t))) 628 sizeof(struct drm_clip_rect)))
629 return DRM_ERR(EFAULT); 629 return DRM_ERR(EFAULT);
630 630
631 ret = i915_dispatch_batchbuffer(dev, &batch); 631 ret = i915_dispatch_batchbuffer(dev, &batch);
@@ -655,7 +655,7 @@ static int i915_cmdbuffer(DRM_IOCTL_ARGS)
655 if (cmdbuf.num_cliprects && 655 if (cmdbuf.num_cliprects &&
656 DRM_VERIFYAREA_READ(cmdbuf.cliprects, 656 DRM_VERIFYAREA_READ(cmdbuf.cliprects,
657 cmdbuf.num_cliprects * 657 cmdbuf.num_cliprects *
658 sizeof(drm_clip_rect_t))) { 658 sizeof(struct drm_clip_rect))) {
659 DRM_ERROR("Fault accessing cliprects\n"); 659 DRM_ERROR("Fault accessing cliprects\n");
660 return DRM_ERR(EFAULT); 660 return DRM_ERR(EFAULT);
661 } 661 }