Commit 8aeef9d4 authored by Chia-I Wu's avatar Chia-I Wu Committed by Gerd Hoffmann
Browse files

drm/virtio: make sure context is created in gem open 



The context might still be missing when DRM_IOCTL_PRIME_FD_TO_HANDLE is
the first ioctl on the drm_file.

Fixes: 72b48ae8 ("drm/virtio: enqueue virtio_gpu_create_context after the first 3D ioctl")
Cc: Gurchetan Singh <gurchetansingh@chromium.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarChia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210107210726.269584-1-olvaffe@gmail.com


Reviewed-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent e695e623

drivers/gpu/drm/virtio/virtgpu_gem.c

+5 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ static int virtio_gpu_gem_create(struct drm_file *file, 
	int ret;

	u32 handle;



	if (vgdev->has_virgl_3d)

		virtio_gpu_create_context(dev, file);



	ret = virtio_gpu_object_create(vgdev, params, &obj, NULL);

	if (ret < 0)

		return ret;
@@ -119,6 +116,11 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, 
	if (!vgdev->has_virgl_3d)

		goto out_notify;



	/* the context might still be missing when the first ioctl is

	 * DRM_IOCTL_MODE_CREATE_DUMB or DRM_IOCTL_PRIME_FD_TO_HANDLE

	 */

	virtio_gpu_create_context(obj->dev, file);



	objs = virtio_gpu_array_alloc(1);

	if (!objs)

		return -ENOMEM;