Commit 45c5d2a4 authored by Gurchetan Singh's avatar Gurchetan Singh Committed by Gerd Hoffmann
Browse files

drm/virtio: only destroy created contexts 



This can happen if userspace doesn't issue any 3D ioctls before
closing the DRM fd.

Fixes: 72b48ae8 ("drm/virtio: enqueue virtio_gpu_create_context after the first 3D ioctl")
Signed-off-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200408232938.55816-1-gurchetansingh@chromium.org


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent dbc05ae3

drivers/gpu/drm/virtio/virtgpu_kms.c

+6 −11
Original line number Diff line number Diff line
@@ -52,14 +52,6 @@ static void virtio_gpu_config_changed_work_func(struct work_struct *work) 
		      events_clear, &events_clear);

}



static void virtio_gpu_context_destroy(struct virtio_gpu_device *vgdev,

				      uint32_t ctx_id)

{

	virtio_gpu_cmd_context_destroy(vgdev, ctx_id);

	virtio_gpu_notify(vgdev);

	ida_free(&vgdev->ctx_id_ida, ctx_id - 1);

}



static void virtio_gpu_init_vq(struct virtio_gpu_queue *vgvq,

			       void (*work_func)(struct work_struct *work))

{
@@ -274,14 +266,17 @@ int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file) 
void virtio_gpu_driver_postclose(struct drm_device *dev, struct drm_file *file)

{

	struct virtio_gpu_device *vgdev = dev->dev_private;

	struct virtio_gpu_fpriv *vfpriv;

	struct virtio_gpu_fpriv *vfpriv = file->driver_priv;



	if (!vgdev->has_virgl_3d)

		return;



	vfpriv = file->driver_priv;

	if (vfpriv->context_created) {

		virtio_gpu_cmd_context_destroy(vgdev, vfpriv->ctx_id);

		virtio_gpu_notify(vgdev);

	}



	virtio_gpu_context_destroy(vgdev, vfpriv->ctx_id);

	ida_free(&vgdev->ctx_id_ida, vfpriv->ctx_id - 1);

	mutex_destroy(&vfpriv->context_lock);

	kfree(vfpriv);

	file->driver_priv = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE