Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c32c3dd authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Gerd Hoffmann
Browse files

drm/virtio: drop virtio_gpu_execbuffer_ioctl() wrapping 



Instead of wrapping virtio_gpu_execbuffer() to execute the ioctl
just execute it directly.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Message-id: 1472660813-28219-1-git-send-email-gustavo@padovan.org
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent b28c69dd

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+8 −16
Original line number Diff line number Diff line
@@ -89,10 +89,16 @@ static void virtio_gpu_unref_list(struct list_head *head) 
	}

}



static int virtio_gpu_execbuffer(struct drm_device *dev,

				 struct drm_virtgpu_execbuffer *exbuf,

/*

 * Usage of execbuffer:

 * Relocations need to take into account the full VIRTIO_GPUDrawable size.

 * However, the command as passed from user space must *not* contain the initial

 * VIRTIO_GPUReleaseInfo struct (first XXX bytes)

 */

static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,

				 struct drm_file *drm_file)

{

	struct drm_virtgpu_execbuffer *exbuf = data;

	struct virtio_gpu_device *vgdev = dev->dev_private;

	struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv;

	struct drm_gem_object *gobj;
@@ -182,20 +188,6 @@ static int virtio_gpu_execbuffer(struct drm_device *dev, 
	return ret;

}



/*

 * Usage of execbuffer:

 * Relocations need to take into account the full VIRTIO_GPUDrawable size.

 * However, the command as passed from user space must *not* contain the initial

 * VIRTIO_GPUReleaseInfo struct (first XXX bytes)

 */

static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,

				       struct drm_file *file_priv)

{

	struct drm_virtgpu_execbuffer *execbuffer = data;

	return virtio_gpu_execbuffer(dev, execbuffer, file_priv);

}





static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data,

				     struct drm_file *file_priv)

{