Commit ae0dc3cc authored by Gerd Hoffmann's avatar Gerd Hoffmann

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

Drop pointless resid variable in virtio_gpufb_create(), just use
the hw_res_handle field in virtio_gpu_object directly.
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181019061847.18958-3-kraxel@redhat.com
parent 23c897d7
...@@ -214,7 +214,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, ...@@ -214,7 +214,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
struct drm_mode_fb_cmd2 mode_cmd = {}; struct drm_mode_fb_cmd2 mode_cmd = {};
struct virtio_gpu_object *obj; struct virtio_gpu_object *obj;
uint32_t resid, format, size; uint32_t format, size;
int ret; int ret;
mode_cmd.width = sizes->surface_width; mode_cmd.width = sizes->surface_width;
...@@ -231,8 +231,8 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, ...@@ -231,8 +231,8 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
if (IS_ERR(obj)) if (IS_ERR(obj))
return PTR_ERR(obj); return PTR_ERR(obj);
virtio_gpu_resource_id_get(vgdev, &resid); virtio_gpu_resource_id_get(vgdev, &obj->hw_res_handle);
virtio_gpu_cmd_create_resource(vgdev, obj, resid, format, virtio_gpu_cmd_create_resource(vgdev, obj, obj->hw_res_handle, format,
mode_cmd.width, mode_cmd.height); mode_cmd.width, mode_cmd.height);
ret = virtio_gpu_object_kmap(obj); ret = virtio_gpu_object_kmap(obj);
...@@ -242,7 +242,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, ...@@ -242,7 +242,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
} }
/* attach the object to the resource */ /* attach the object to the resource */
ret = virtio_gpu_object_attach(vgdev, obj, resid, NULL); ret = virtio_gpu_object_attach(vgdev, obj, obj->hw_res_handle, NULL);
if (ret) if (ret)
goto err_obj_attach; goto err_obj_attach;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment