Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Message-id: 1472660813-28219-1-git-send-email-gustavo@padovan.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

authored by

Gustavo Padovan and committed by
Gerd Hoffmann
5c32c3dd b28c69dd

+8 -16
+8 -16
drivers/gpu/drm/virtio/virtgpu_ioctl.c
··· 89 89 } 90 90 } 91 91 92 - static int virtio_gpu_execbuffer(struct drm_device *dev, 93 - struct drm_virtgpu_execbuffer *exbuf, 92 + /* 93 + * Usage of execbuffer: 94 + * Relocations need to take into account the full VIRTIO_GPUDrawable size. 95 + * However, the command as passed from user space must *not* contain the initial 96 + * VIRTIO_GPUReleaseInfo struct (first XXX bytes) 97 + */ 98 + static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, 94 99 struct drm_file *drm_file) 95 100 { 101 + struct drm_virtgpu_execbuffer *exbuf = data; 96 102 struct virtio_gpu_device *vgdev = dev->dev_private; 97 103 struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv; 98 104 struct drm_gem_object *gobj; ··· 187 181 drm_free_large(buflist); 188 182 return ret; 189 183 } 190 - 191 - /* 192 - * Usage of execbuffer: 193 - * Relocations need to take into account the full VIRTIO_GPUDrawable size. 194 - * However, the command as passed from user space must *not* contain the initial 195 - * VIRTIO_GPUReleaseInfo struct (first XXX bytes) 196 - */ 197 - static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, 198 - struct drm_file *file_priv) 199 - { 200 - struct drm_virtgpu_execbuffer *execbuffer = data; 201 - return virtio_gpu_execbuffer(dev, execbuffer, file_priv); 202 - } 203 - 204 184 205 185 static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data, 206 186 struct drm_file *file_priv)