diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-02-19 13:35:18 +1000 |
| commit | 84266fcb3af6ba9e215adf0c482914963579639c (patch) | |
| tree | 830dac899929af5370fb5373154588f3687718b5 /drivers/gpu/drm/virtio/virtgpu_gem.c | |
| parent | f40ddce88593482919761f74910f42f4b84c004b (diff) | |
| parent | ac35d19fe871c81b9d78053d675095b597270304 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.11-merged
Trial merge for Linus
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_gem.c')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_gem.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index c30c75ee83fc..8502400b2f9c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -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; |