drm/virtio: rework virtio_gpu_cmd_context_{attach, detach}_resource

Switch to the virtio_gpu_array_* helper workflow.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190829103301.3539-13-kraxel@redhat.com

diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 4f54bf7..d5ef251 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -313,10 +313,10 @@ void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev,
                                    uint32_t id);
 void virtio_gpu_cmd_context_attach_resource(struct virtio_gpu_device *vgdev,
                                            uint32_t ctx_id,
-                                           uint32_t resource_id);
+                                           struct virtio_gpu_object_array *objs);
 void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev,
                                            uint32_t ctx_id,
-                                           uint32_t resource_id);
+                                           struct virtio_gpu_object_array *objs);
 void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,
                           void *data, uint32_t data_size,
                           uint32_t ctx_id,

diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index fd60b45..fd4eeee 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -136,19 +136,18 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
 {
        struct virtio_gpu_device *vgdev = obj->dev->dev_private;
        struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
-       struct virtio_gpu_object *qobj = gem_to_virtio_gpu_obj(obj);
-       int r;
+       struct virtio_gpu_object_array *objs;
 
        if (!vgdev->has_virgl_3d)
                return 0;
 
-       r = virtio_gpu_object_reserve(qobj);
-       if (r)
-               return r;
+       objs = virtio_gpu_array_alloc(1);
+       if (!objs)
+               return -ENOMEM;
+       virtio_gpu_array_add_obj(objs, obj);
 
        virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id,
-                                              qobj->hw_res_handle);
-       virtio_gpu_object_unreserve(qobj);
+                                              objs);
        return 0;
 }
 
@@ -157,19 +156,18 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj,
 {
        struct virtio_gpu_device *vgdev = obj->dev->dev_private;
        struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
-       struct virtio_gpu_object *qobj = gem_to_virtio_gpu_obj(obj);
-       int r;
+       struct virtio_gpu_object_array *objs;
 
        if (!vgdev->has_virgl_3d)
                return;
 
-       r = virtio_gpu_object_reserve(qobj);
-       if (r)
+       objs = virtio_gpu_array_alloc(1);
+       if (!objs)
                return;
+       virtio_gpu_array_add_obj(objs, obj);
 
        virtio_gpu_cmd_context_detach_resource(vgdev, vfpriv->ctx_id,
-                                               qobj->hw_res_handle);
-       virtio_gpu_object_unreserve(qobj);
+                                              objs);
 }
 
 struct virtio_gpu_object_array *virtio_gpu_array_alloc(u32 nents)

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 2071409..d00439c 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -838,34 +838,38 @@ void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev,
 
 void virtio_gpu_cmd_context_attach_resource(struct virtio_gpu_device *vgdev,
                                            uint32_t ctx_id,
-                                           uint32_t resource_id)
+                                           struct virtio_gpu_object_array *objs)
 {
+       struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(objs->objs[0]);
        struct virtio_gpu_ctx_resource *cmd_p;
        struct virtio_gpu_vbuffer *vbuf;
 
        cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
        memset(cmd_p, 0, sizeof(*cmd_p));
+       vbuf->objs = objs;
 
        cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE);
        cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
-       cmd_p->resource_id = cpu_to_le32(resource_id);
+       cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
        virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
 
 }
 
 void virtio_gpu_cmd_context_detach_resource(struct virtio_gpu_device *vgdev,
                                            uint32_t ctx_id,
-                                           uint32_t resource_id)
+                                           struct virtio_gpu_object_array *objs)
 {
+       struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(objs->objs[0]);
        struct virtio_gpu_ctx_resource *cmd_p;
        struct virtio_gpu_vbuffer *vbuf;
 
        cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
        memset(cmd_p, 0, sizeof(*cmd_p));
+       vbuf->objs = objs;
 
        cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE);
        cmd_p->hdr.ctx_id = cpu_to_le32(ctx_id);
-       cmd_p->resource_id = cpu_to_le32(resource_id);
+       cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle);
        virtio_gpu_queue_ctrl_buffer(vgdev, vbuf);
 }