1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index eca765537470..77eac4eb06b1 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -25,6 +25,18 @@
 
 #include "virtgpu_drv.h"
 
+static void virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev,
+                                       uint32_t *resid)
+{
+        int handle = ida_alloc_min(&vgdev->resource_ida, 1, GFP_KERNEL);
+        *resid = handle;
+}
+
+static void virtio_gpu_resource_id_put(struct virtio_gpu_device *vgdev, uint32_t id)
+{
+        ida_free(&vgdev->resource_ida, id);
+}
+
 static void virtio_gpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)
 {
         struct virtio_gpu_object *bo;
@@ -33,13 +45,14 @@ static void virtio_gpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)
         bo = container_of(tbo, struct virtio_gpu_object, tbo);
         vgdev = (struct virtio_gpu_device *)bo->gem_base.dev->dev_private;
 
-        if (bo->hw_res_handle)
+        if (bo->created)
                 virtio_gpu_cmd_unref_resource(vgdev, bo->hw_res_handle);
         if (bo->pages)
                 virtio_gpu_object_free_sg_table(bo);
         if (bo->vmap)
                 virtio_gpu_object_kunmap(bo);
         drm_gem_object_release(&bo->gem_base);
+        virtio_gpu_resource_id_put(vgdev, bo->hw_res_handle);
         kfree(bo);
 }
 
@@ -81,9 +94,11 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
         bo = kzalloc(sizeof(struct virtio_gpu_object), GFP_KERNEL);
         if (bo == NULL)
                 return -ENOMEM;
+        virtio_gpu_resource_id_get(vgdev, &bo->hw_res_handle);
         size = roundup(size, PAGE_SIZE);
         ret = drm_gem_object_init(vgdev->ddev, &bo->gem_base, size);
         if (ret != 0) {
+                virtio_gpu_resource_id_put(vgdev, bo->hw_res_handle);
                 kfree(bo);
                 return ret;
         }