Commit 086b9f27 authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Dmitry Osipenko
Browse files

drm/virtio: Don't create a context with default param if context_init is supported 



Xorg context creation fails for native contexts that use
VIRTGPU_CONTEXT_INIT because context is already initialized implicitly
when dumb buffer is created. Fix it by not creating default vrend context
if context_init is supported.

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241020224725.179937-1-dmitry.osipenko@collabora.com
parent c85021f3

drivers/gpu/drm/virtio/virtgpu_gem.c

+5 −3
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, 
	/* the context might still be missing when the first ioctl is

	 * DRM_IOCTL_MODE_CREATE_DUMB or DRM_IOCTL_PRIME_FD_TO_HANDLE

	 */

	if (!vgdev->has_context_init)

		virtio_gpu_create_context(obj->dev, file);



	objs = virtio_gpu_array_alloc(1);
@@ -119,8 +120,9 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj, 
		return -ENOMEM;

	virtio_gpu_array_add_obj(objs, obj);



	virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id,

					       objs);

	if (vfpriv->ctx_id)

		virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id, objs);



out_notify:

	virtio_gpu_notify(vgdev);

	return 0;