Commit 40cadedd authored by Gurchetan Singh's avatar Gurchetan Singh Committed by Gerd Hoffmann

drm/virtio: factor out context create hypercall

We currently create an OpenGL context when opening the DRM fd
if 3D is available.

We may need other context types (VK,..) in the future, and the plan
is to have explicit initialization for that.

For explicit initialization to work, we need to factor out
virtio_gpu_create_context from driver initialization.

v2: Move context handle initialization too (olv)
v6: Remove redundant 3D check (emil.velikov)
Reviewed-by: default avatarChia-I Wu <olvaffe@gmail.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Signed-off-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200225000800.2966-2-gurchetansingh@chromium.orgSigned-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 30349f8f
...@@ -214,6 +214,8 @@ struct virtio_gpu_fpriv { ...@@ -214,6 +214,8 @@ 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);
......
...@@ -33,6 +33,19 @@ ...@@ -33,6 +33,19 @@
#include "virtgpu_drv.h" #include "virtgpu_drv.h"
void virtio_gpu_create_context(struct drm_device *dev,
struct drm_file *file)
{
struct virtio_gpu_device *vgdev = dev->dev_private;
struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
char dbgname[TASK_COMM_LEN];
get_task_comm(dbgname, current);
virtio_gpu_cmd_context_create(vgdev, vfpriv->ctx_id,
strlen(dbgname), dbgname);
virtio_gpu_notify(vgdev);
}
static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data, static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data,
struct drm_file *file) struct drm_file *file)
{ {
......
...@@ -52,19 +52,6 @@ static void virtio_gpu_config_changed_work_func(struct work_struct *work) ...@@ -52,19 +52,6 @@ static void virtio_gpu_config_changed_work_func(struct work_struct *work)
events_clear, &events_clear); events_clear, &events_clear);
} }
static int virtio_gpu_context_create(struct virtio_gpu_device *vgdev,
uint32_t nlen, const char *name)
{
int handle = ida_alloc(&vgdev->ctx_id_ida, GFP_KERNEL);
if (handle < 0)
return handle;
handle += 1;
virtio_gpu_cmd_context_create(vgdev, handle, nlen, name);
virtio_gpu_notify(vgdev);
return handle;
}
static void virtio_gpu_context_destroy(struct virtio_gpu_device *vgdev, static void virtio_gpu_context_destroy(struct virtio_gpu_device *vgdev,
uint32_t ctx_id) uint32_t ctx_id)
{ {
...@@ -260,8 +247,7 @@ int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file) ...@@ -260,8 +247,7 @@ int virtio_gpu_driver_open(struct drm_device *dev, 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; struct virtio_gpu_fpriv *vfpriv;
int id; int handle;
char dbgname[TASK_COMM_LEN];
/* can't create contexts without 3d renderer */ /* can't create contexts without 3d renderer */
if (!vgdev->has_virgl_3d) if (!vgdev->has_virgl_3d)
...@@ -272,15 +258,15 @@ int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file) ...@@ -272,15 +258,15 @@ int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file)
if (!vfpriv) if (!vfpriv)
return -ENOMEM; return -ENOMEM;
get_task_comm(dbgname, current); handle = ida_alloc(&vgdev->ctx_id_ida, GFP_KERNEL);
id = virtio_gpu_context_create(vgdev, strlen(dbgname), dbgname); if (handle < 0) {
if (id < 0) {
kfree(vfpriv); kfree(vfpriv);
return id; return handle;
} }
vfpriv->ctx_id = id; vfpriv->ctx_id = handle + 1;
file->driver_priv = vfpriv; file->driver_priv = vfpriv;
virtio_gpu_create_context(dev, file);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment