leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/virtio: create context before RESOURCE_CREATE_2D in 3D mode

Browse Source 
If 3D is enabled, but userspace requests a dumb buffer, we will
call CTX_ATTACH_RESOURCE before actually creating the context.

Fixes: 72b48ae800 ("drm/virtio: enqueue virtio_gpu_create_context after the first 3D ioctl")
Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200501185557.740-1-gurchetansingh@chromium.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gurchetan Singh 2020-05-01 11:55:57 -07:00 committed by Gerd Hoffmann
parent 6f49c2515e
commit c3e2850a9b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/virtio/virtgpu_drv.h
View File

@ -221,6 +221,7 @@ struct virtio_gpu_fpriv {
/* virtio_ioctl.c */ /* virtio_ioctl.c */
#define DRM_VIRTIO_NUM_IOCTLS 10 #define DRM_VIRTIO_NUM_IOCTLS 10
extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS]; extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS];
void virtio_gpu_create_context(struct drm_device *dev, struct drm_file *file);
/* virtio_kms.c */ /* virtio_kms.c */
int virtio_gpu_init(struct drm_device *dev); int virtio_gpu_init(struct drm_device *dev);

3
drivers/gpu/drm/virtio/virtgpu_gem.c
View File

@ -39,6 +39,9 @@ int virtio_gpu_gem_create(struct drm_file *file,
int ret; int ret;
u32 handle; u32 handle;
if (vgdev->has_virgl_3d)
virtio_gpu_create_context(dev, file);
ret = virtio_gpu_object_create(vgdev, params, &obj, NULL); ret = virtio_gpu_object_create(vgdev, params, &obj, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;

3
drivers/gpu/drm/virtio/virtgpu_ioctl.c
View File

@ -33,8 +33,7 @@
#include "virtgpu_drv.h" #include "virtgpu_drv.h"
static void virtio_gpu_create_context(struct drm_device *dev, void virtio_gpu_create_context(struct drm_device *dev, struct drm_file *file)
struct drm_file *file)
{ {
struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_device *vgdev = dev->dev_private;
struct virtio_gpu_fpriv *vfpriv = file->driver_priv; struct virtio_gpu_fpriv *vfpriv = file->driver_priv;