Commit 1d6ac185 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: Kill DRM_COPY_(TO|FROM)_USER 



Less yelling ftw!

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 57ed0f7b

drivers/gpu/drm/drm_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int drm_buffer_copy_from_user(struct drm_buffer *buf, 


	for (idx = 0; idx < nr_pages; ++idx) {



		if (DRM_COPY_FROM_USER(buf->data[idx],

		if (copy_from_user(buf->data[idx],

			user_data + idx * PAGE_SIZE,

			min(PAGE_SIZE, size - idx * PAGE_SIZE))) {

			DRM_ERROR("Failed to copy user data (%p) to drm buffer"

drivers/gpu/drm/i915/i915_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static int i915_irq_emit(struct drm_device *dev, void *data, 
	result = i915_emit_irq(dev);

	mutex_unlock(&dev->struct_mutex);



	if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {

	if (copy_to_user(emit->irq_seq, &result, sizeof(int))) {

		DRM_ERROR("copy_to_user\n");

		return -EFAULT;

	}
@@ -1008,8 +1008,8 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	if (DRM_COPY_TO_USER(param->value, &value, sizeof(int))) {

		DRM_ERROR("DRM_COPY_TO_USER failed\n");

	if (copy_to_user(param->value, &value, sizeof(int))) {

		DRM_ERROR("copy_to_user failed\n");

		return -EFAULT;

	}

drivers/gpu/drm/mga/mga_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -1075,10 +1075,10 @@ static int mga_dma_get_buffers(struct drm_device *dev, 


		buf->file_priv = file_priv;



		if (DRM_COPY_TO_USER(&d->request_indices[i],

		if (copy_to_user(&d->request_indices[i],

				     &buf->idx, sizeof(buf->idx)))

			return -EFAULT;

		if (DRM_COPY_TO_USER(&d->request_sizes[i],

		if (copy_to_user(&d->request_sizes[i],

				     &buf->total, sizeof(buf->total)))

			return -EFAULT;

drivers/gpu/drm/mga/mga_state.c

+1 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *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;

	}

drivers/gpu/drm/nouveau/nouveau_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli, 
			b->presumed.valid = 0;

			relocs++;



			if (DRM_COPY_TO_USER(&upbbo[nvbo->pbbo_index].presumed,

			if (copy_to_user(&upbbo[nvbo->pbbo_index].presumed,

					     &b->presumed, sizeof(b->presumed)))

				return -EFAULT;

		}
@@ -593,7 +593,7 @@ u_memcpya(uint64_t user, unsigned nmemb, unsigned size) 
	if (!mem)

		return ERR_PTR(-ENOMEM);



	if (DRM_COPY_FROM_USER(mem, userptr, size)) {

	if (copy_from_user(mem, userptr, size)) {

		u_free(mem);

		return ERR_PTR(-EFAULT);

	}