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

Commit 68f8fc38 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Alistair Delva
Browse files

UPSTREAM: 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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20181019061847.18958-4-kraxel@redhat.com


(cherry picked from commit c40336ba5ed6c67e131cbf82a4fa37faf3bf0ed3)
Signed-off-by: default avatarGreg Hartman <ghartman@google.com>
BUG: 139386237
Change-Id: I151241825d4c8c51297d29bd229d3cd6ccf411af
parent 7a7d7a4a

drivers/gpu/drm/virtio/virtgpu_gem.c

+3 −5
Original line number Diff line number Diff line
@@ -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;



	pitch = args->width * ((args->bpp + 1) / 8);
@@ -101,13 +100,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;