Skip to content

Commit

Permalink
drm/virtio: Don't create a context with default param if context_init…
Browse files Browse the repository at this point in the history
… 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: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241020224725.179937-1-dmitry.osipenko@collabora.com
  • Loading branch information
Pierre-Eric Pelloux-Prayer authored and Dmitry Osipenko committed Nov 18, 2024
1 parent c85021f commit 086b9f2
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/gpu/drm/virtio/virtgpu_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,17 @@ 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
*/
virtio_gpu_create_context(obj->dev, file);
if (!vgdev->has_context_init)
virtio_gpu_create_context(obj->dev, file);

objs = virtio_gpu_array_alloc(1);
if (!objs)
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;
Expand Down

0 comments on commit 086b9f2

Please sign in to comment.