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

Commit 23c897d7 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/virtio: track created object state 



Track whenever the virtio_gpu_object is already created (i.e. host knows
about it) in a new variable.  Add checks to virtio_gpu_object_attach()
to do nothing on objects not created yet.

Make virtio_gpu_ttm_bo_destroy() use the new variable too, instead of
expecting hw_res_handle indicating the object state.

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-2-kraxel@redhat.com
parent 918d89bb

drivers/gpu/drm/virtio/virtgpu_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct virtio_gpu_object { 
	struct ttm_placement		placement;

	struct ttm_buffer_object	tbo;

	struct ttm_bo_kmap_obj		kmap;

	bool created;

};

#define gem_to_virtio_gpu_obj(gobj) \

	container_of((gobj), struct virtio_gpu_object, gem_base)
@@ -263,6 +264,7 @@ void virtio_gpu_resource_id_get(struct virtio_gpu_device *vgdev, 
			       uint32_t *resid);

void virtio_gpu_resource_id_put(struct virtio_gpu_device *vgdev, uint32_t id);

void virtio_gpu_cmd_create_resource(struct virtio_gpu_device *vgdev,

				    struct virtio_gpu_object *bo,

				    uint32_t resource_id,

				    uint32_t format,

				    uint32_t width,
@@ -324,6 +326,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, 
					struct virtio_gpu_fence **fence);

void

virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,

				  struct virtio_gpu_object *bo,

				  struct virtio_gpu_resource_create_3d *rc_3d,

				  struct virtio_gpu_fence **fence);

void virtio_gpu_ctrl_ack(struct virtqueue *vq);

drivers/gpu/drm/virtio/virtgpu_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, 
		return PTR_ERR(obj);



	virtio_gpu_resource_id_get(vgdev, &resid);

	virtio_gpu_cmd_create_resource(vgdev, resid, format,

	virtio_gpu_cmd_create_resource(vgdev, obj, resid, format,

				       mode_cmd.width, mode_cmd.height);



	ret = virtio_gpu_object_kmap(obj);

drivers/gpu/drm/virtio/virtgpu_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -103,8 +103,9 @@ int virtio_gpu_mode_dumb_create(struct drm_file *file_priv, 
		goto fail;



	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, resid, format,

	virtio_gpu_cmd_create_resource(vgdev, obj, resid, format,

				       args->width, args->height);



	/* attach the object to the resource */

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
	obj = &qobj->gem_base;



	if (!vgdev->has_virgl_3d) {

		virtio_gpu_cmd_create_resource(vgdev, res_id, rc->format,

		virtio_gpu_cmd_create_resource(vgdev, qobj, res_id, rc->format,

					       rc->width, rc->height);



		ret = virtio_gpu_object_attach(vgdev, qobj, res_id, NULL);
@@ -288,7 +288,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
		rc_3d.nr_samples = cpu_to_le32(rc->nr_samples);

		rc_3d.flags = cpu_to_le32(rc->flags);



		virtio_gpu_cmd_resource_create_3d(vgdev, &rc_3d, NULL);

		virtio_gpu_cmd_resource_create_3d(vgdev, qobj, &rc_3d, NULL);

		ret = virtio_gpu_object_attach(vgdev, qobj, res_id, &fence);

		if (ret) {

			ttm_eu_backoff_reservation(&ticket, &validate_list);

drivers/gpu/drm/virtio/virtgpu_object.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static void virtio_gpu_ttm_bo_destroy(struct ttm_buffer_object *tbo) 
	bo = container_of(tbo, struct virtio_gpu_object, tbo);

	vgdev = (struct virtio_gpu_device *)bo->gem_base.dev->dev_private;



	if (bo->hw_res_handle)

	if (bo->created)

		virtio_gpu_cmd_unref_resource(vgdev, bo->hw_res_handle);

	if (bo->pages)

		virtio_gpu_object_free_sg_table(bo);