drm/virtio: use virtio_gpu_object->hw_res_handle in virtio_gpu_mode_dumb_create()

Drop pointless resid variable in virtio_gpu_mode_dumb_create(), just use
the hw_res_handle field in virtio_gpu_object directly.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181019061847.18958-4-kraxel@redhat.com

diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index 33dbd5aed705efb0bddfed5240451659d2703b0c..8d53451ec4e7bdaec27d1dacd59156c9d379a998 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -87,7 +87,6 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
        struct virtio_gpu_object *obj;
        int ret;
        uint32_t pitch;
-       uint32_t resid;
        uint32_t format;
 
        if (args->bpp != 32)
@@ -104,13 +103,12 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv,
 
        format = virtio_gpu_translate_format(DRM_FORMAT_HOST_XRGB8888);
        obj = gem_to_virtio_gpu_obj(gobj);
-       virtio_gpu_resource_id_get(vgdev, &resid);
-       virtio_gpu_cmd_create_resource(vgdev, obj, resid, format,
+       virtio_gpu_resource_id_get(vgdev, &obj->hw_res_handle);
+       virtio_gpu_cmd_create_resource(vgdev, obj, obj->hw_res_handle, format,
                                       args->width, args->height);
 
        /* attach the object to the resource */
-       obj = gem_to_virtio_gpu_obj(gobj);
-       ret = virtio_gpu_object_attach(vgdev, obj, resid, NULL);
+       ret = virtio_gpu_object_attach(vgdev, obj, obj->hw_res_handle, NULL);
        if (ret)
                goto fail;