projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm-misc...
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
virtio
/
virtgpu_ioctl.c
diff --git
a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index
5df7220
..
7a2430e
100644
(file)
--- a/
drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/
drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@
-278,7
+278,7
@@
static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
drm_gem_object_release(obj);
return ret;
}
drm_gem_object_release(obj);
return ret;
}
- drm_gem_object_put
_unlocked
(obj);
+ drm_gem_object_put(obj);
rc->res_handle = qobj->hw_res_handle; /* similiar to a VM address */
rc->bo_handle = handle;
rc->res_handle = qobj->hw_res_handle; /* similiar to a VM address */
rc->bo_handle = handle;
@@
-300,7
+300,7
@@
static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data,
ri->size = qobj->base.base.size;
ri->res_handle = qobj->hw_res_handle;
ri->size = qobj->base.base.size;
ri->res_handle = qobj->hw_res_handle;
- drm_gem_object_put
_unlocked
(gobj);
+ drm_gem_object_put(gobj);
return 0;
}
return 0;
}
@@
-417,7
+417,7
@@
static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data,
else if (ret > 0)
ret = 0;
else if (ret > 0)
ret = 0;
- drm_gem_object_put
_unlocked
(obj);
+ drm_gem_object_put(obj);
return ret;
}
return ret;
}