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

drm/virtio: remove ttm calls from in virtio_gpu_object_{reserve, unreserve} 

Call reservation_object_* directly instead
of using ttm_bo_{reserve,unreserve}.

v4: check for EINTR only.
v3: check for EINTR too.

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-7-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-08-29 12:32:49 +02:00
parent 23a0e88eba
commit cde14fd4a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/virtio/virtgpu_drv.h
View File

@ -402,9 +402,9 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)
{ {
int r; int r;
r = ttm_bo_reserve(&bo->tbo, true, false, NULL); r = dma_resv_lock_interruptible(bo->gem_base.resv, NULL);
if (unlikely(r != 0)) { if (unlikely(r != 0)) {
if (r != -ERESTARTSYS) { if (r != -EINTR) {
struct virtio_gpu_device *qdev = struct virtio_gpu_device *qdev =
bo->gem_base.dev->dev_private; bo->gem_base.dev->dev_private;
dev_err(qdev->dev, "%p reserve failed\n", bo); dev_err(qdev->dev, "%p reserve failed\n", bo);
@ -416,7 +416,7 @@ static inline int virtio_gpu_object_reserve(struct virtio_gpu_object *bo)
static inline void virtio_gpu_object_unreserve(struct virtio_gpu_object *bo) static inline void virtio_gpu_object_unreserve(struct virtio_gpu_object *bo)
{ {
ttm_bo_unreserve(&bo->tbo); dma_resv_unlock(bo->gem_base.resv);
} }
/* virgl debufs */ /* virgl debufs */