UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/virtio: switch virtio_gpu_wait_ioctl() to gem helper. 

Use drm_gem_reservation_object_wait() in virtio_gpu_wait_ioctl().
This also makes the ioctl run lockless.

v9: fix return value.
v5: handle lookup failure.
v2: use reservation_object_test_signaled_rcu for VIRTGPU_WAIT_NOWAIT.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190829103301.3539-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-08-29 12:32:45 +02:00
parent 889165ad61
commit 29cf12394c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/virtio/virtgpu_ioctl.c
View File

@ -466,22 +466,26 @@ static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data,
struct drm_file *file) struct drm_file *file)
{ {
struct drm_virtgpu_3d_wait *args = data; struct drm_virtgpu_3d_wait *args = data;
struct drm_gem_object *gobj = NULL; struct drm_gem_object *obj;
struct virtio_gpu_object *qobj = NULL; long timeout = 15 * HZ;
int ret; int ret;
bool nowait = false;
gobj = drm_gem_object_lookup(file, args->handle); obj = drm_gem_object_lookup(file, args->handle);
if (gobj == NULL) if (obj == NULL)
return -ENOENT; return -ENOENT;
qobj = gem_to_virtio_gpu_obj(gobj); if (args->flags & VIRTGPU_WAIT_NOWAIT) {
ret = dma_resv_test_signaled_rcu(obj->resv, true);
} else {
ret = dma_resv_wait_timeout_rcu(obj->resv, true, true,
timeout);
}
if (ret == 0)
ret = -EBUSY;
else if (ret > 0)
ret = 0;
if (args->flags & VIRTGPU_WAIT_NOWAIT) drm_gem_object_put_unlocked(obj);
nowait = true;
ret = virtio_gpu_object_wait(qobj, nowait);
drm_gem_object_put_unlocked(gobj);
return ret; return ret;
} }