drm: Kill DRM_COPY_(TO|FROM)_USER
Less yelling ftw! Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:

committed by
Dave Airlie

parent
57ed0f7b43
commit
1d6ac185c3
@@ -1810,7 +1810,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,
|
||||
}
|
||||
if (!buf) {
|
||||
DRM_DEBUG("EAGAIN\n");
|
||||
if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image)))
|
||||
if (copy_to_user(tex->image, image, sizeof(*image)))
|
||||
return -EFAULT;
|
||||
return -EAGAIN;
|
||||
}
|
||||
@@ -1823,7 +1823,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,
|
||||
|
||||
#define RADEON_COPY_MT(_buf, _data, _width) \
|
||||
do { \
|
||||
if (DRM_COPY_FROM_USER(_buf, _data, (_width))) {\
|
||||
if (copy_from_user(_buf, _data, (_width))) {\
|
||||
DRM_ERROR("EFAULT on pad, %d bytes\n", (_width)); \
|
||||
return -EFAULT; \
|
||||
} \
|
||||
@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
|
||||
if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
|
||||
sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
|
||||
|
||||
if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
|
||||
if (copy_from_user(&depth_boxes, clear->depth_boxes,
|
||||
sarea_priv->nbox * sizeof(depth_boxes[0])))
|
||||
return -EFAULT;
|
||||
|
||||
@@ -2436,7 +2436,7 @@ static int radeon_cp_texture(struct drm_device *dev, void *data, struct drm_file
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (DRM_COPY_FROM_USER(&image,
|
||||
if (copy_from_user(&image,
|
||||
(drm_radeon_tex_image_t __user *) tex->image,
|
||||
sizeof(image)))
|
||||
return -EFAULT;
|
||||
@@ -2460,7 +2460,7 @@ static int radeon_cp_stipple(struct drm_device *dev, void *data, struct drm_file
|
||||
|
||||
LOCK_TEST_WITH_RETURN(dev, file_priv);
|
||||
|
||||
if (DRM_COPY_FROM_USER(&mask, stipple->mask, 32 * sizeof(u32)))
|
||||
if (copy_from_user(&mask, stipple->mask, 32 * sizeof(u32)))
|
||||
return -EFAULT;
|
||||
|
||||
RING_SPACE_TEST_WITH_RETURN(dev_priv);
|
||||
@@ -2585,13 +2585,13 @@ static int radeon_cp_vertex2(struct drm_device *dev, void *data, struct drm_file
|
||||
drm_radeon_prim_t prim;
|
||||
drm_radeon_tcl_prim_t tclprim;
|
||||
|
||||
if (DRM_COPY_FROM_USER(&prim, &vertex->prim[i], sizeof(prim)))
|
||||
if (copy_from_user(&prim, &vertex->prim[i], sizeof(prim)))
|
||||
return -EFAULT;
|
||||
|
||||
if (prim.stateidx != laststate) {
|
||||
drm_radeon_state_t state;
|
||||
|
||||
if (DRM_COPY_FROM_USER(&state,
|
||||
if (copy_from_user(&state,
|
||||
&vertex->state[prim.stateidx],
|
||||
sizeof(state)))
|
||||
return -EFAULT;
|
||||
@@ -2799,7 +2799,7 @@ static int radeon_emit_packet3_cliprect(struct drm_device *dev,
|
||||
|
||||
do {
|
||||
if (i < cmdbuf->nbox) {
|
||||
if (DRM_COPY_FROM_USER(&box, &boxes[i], sizeof(box)))
|
||||
if (copy_from_user(&box, &boxes[i], sizeof(box)))
|
||||
return -EFAULT;
|
||||
/* FIXME The second and subsequent times round
|
||||
* this loop, send a WAIT_UNTIL_3D_IDLE before
|
||||
@@ -3116,7 +3116,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (DRM_COPY_TO_USER(param->value, &value, sizeof(int))) {
|
||||
if (copy_to_user(param->value, &value, sizeof(int))) {
|
||||
DRM_ERROR("copy_to_user\n");
|
||||
return -EFAULT;
|
||||
}
|
||||
|
Reference in New Issue
Block a user