Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae0dc3cc authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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

drivers/gpu/drm/virtio/virtgpu_fb.c

+4 −4
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	struct drm_framebuffer *fb;

	struct drm_mode_fb_cmd2 mode_cmd = {};

	struct virtio_gpu_object *obj;

	uint32_t resid, format, size;

	uint32_t format, size;

	int ret;



	mode_cmd.width = sizes->surface_width;
@@ -231,8 +231,8 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	if (IS_ERR(obj))

		return PTR_ERR(obj);



	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,

				       mode_cmd.width, mode_cmd.height);



	ret = virtio_gpu_object_kmap(obj);
@@ -242,7 +242,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
	}



	/* 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)

		goto err_obj_attach;