virtio-gpu: add VIRTIO_GPU_F_EDID feature
Subsystems (4)
Gerd Hoffmann
maintainercover virtio-gpu: add VIRTIO_GPU_F_EDID feature
Gerd Hoffmann (3):
drm: virtual connectors can have edid too
virtio-gpu: add VIRTIO_GPU_F_EDID feature
drm/virtio: add edid support
drivers/gpu/drm/virtio/virtgpu_drv.h | 3 ++ include/uapi/linux/virtio_gpu.h | 17 +++++++++ drivers/gpu/drm/drm_connector.c | 3 +- drivers/gpu/drm/virtio/virtgpu_display.c | 6 ++++ drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + drivers/gpu/drm/virtio/virtgpu_kms.c | 8 +++++ drivers/gpu/drm/virtio/virtgpu_vq.c | 59 ++++++++++++++++++++++++++++++++ 7 files changed, 95 insertions(+), 2 deletions(-)
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 1/3 drm: virtual connectors can have edid too
--- drivers/gpu/drm/drm_connector.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/drm_connector.c +1 -2
@@ -254,8 +254,7 @@ int drm_connector_init(struct drm_device *dev, config->num_connector++;spin_unlock_irq (&config->connector_list_lock); -if (connector_type !=DRM_MODE_CONNECTOR_VIRTUAL && - connector_type !=DRM_MODE_CONNECTOR_WRITEBACK ) +if (connector_type !=DRM_MODE_CONNECTOR_WRITEBACK )drm_object_attach_property (&connector->base, config->edid_property,0 );
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 2/3 virtio-gpu: add VIRTIO_GPU_F_EDID feature
In reply to Gerd HoffmannThe feature allows the guest request an EDID blob (describing monitor capabilities) for a given scanout (aka virtual monitor connector).
It brings a new command message, which has just a scanout field (beside the standard virtio-gpu header) and a response message which carries the EDID data.
--- include/uapi/linux/virtio_gpu.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/uapi/linux/virtio_gpu.h +17 -0
@@ -41,6 +41,7 @@#include <linux/types.h> #define VIRTIO_GPU_F_VIRGL 0 +#define VIRTIO_GPU_F_EDID 1enum virtio_gpu_ctrl_type {VIRTIO_GPU_UNDEFINED =0 ,
@@ -56,6 +57,7 @@ enum virtio_gpu_ctrl_type {VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING ,VIRTIO_GPU_CMD_GET_CAPSET_INFO ,VIRTIO_GPU_CMD_GET_CAPSET , +VIRTIO_GPU_CMD_GET_EDID ,/* 3d commands */ VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
@@ -76,6 +78,7 @@ enum virtio_gpu_ctrl_type {VIRTIO_GPU_RESP_OK_DISPLAY_INFO ,VIRTIO_GPU_RESP_OK_CAPSET_INFO ,VIRTIO_GPU_RESP_OK_CAPSET , +VIRTIO_GPU_RESP_OK_EDID ,/* error responses */ VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
@@ -291,6 +294,20 @@ struct virtio_gpu_resp_capset {__u8 capset_data[]; }; +/* VIRTIO_GPU_CMD_GET_EDID */ +struct virtio_gpu_get_edid { +struct virtio_gpu_ctrl_hdr hdr; +__le32 scanout; +}; + +/* VIRTIO_GPU_RESP_OK_EDID */ +struct virtio_gpu_resp_edid { +struct virtio_gpu_ctrl_hdr hdr; +__le32 scanout; +__le32 size; +__u8 edid[512 ]; +}; +#define VIRTIO_GPU_EVENT_DISPLAY (1 << 0)struct virtio_gpu_config {
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 2/3 virtio-gpu: add VIRTIO_GPU_F_EDID feature
In reply to Gerd HoffmannThe feature allows the guest request an EDID blob (describing monitor capabilities) for a given scanout (aka virtual monitor connector).
It brings a new command message, which has just a scanout field (beside the standard virtio-gpu header) and a response message which carries the EDID data.
--- include/uapi/linux/virtio_gpu.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/uapi/linux/virtio_gpu.h +17 -0
@@ -41,6 +41,7 @@#include <linux/types.h> #define VIRTIO_GPU_F_VIRGL 0 +#define VIRTIO_GPU_F_EDID 1enum virtio_gpu_ctrl_type {VIRTIO_GPU_UNDEFINED =0 ,
@@ -56,6 +57,7 @@ enum virtio_gpu_ctrl_type {VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING ,VIRTIO_GPU_CMD_GET_CAPSET_INFO ,VIRTIO_GPU_CMD_GET_CAPSET , +VIRTIO_GPU_CMD_GET_EDID ,/* 3d commands */ VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
@@ -76,6 +78,7 @@ enum virtio_gpu_ctrl_type {VIRTIO_GPU_RESP_OK_DISPLAY_INFO ,VIRTIO_GPU_RESP_OK_CAPSET_INFO ,VIRTIO_GPU_RESP_OK_CAPSET , +VIRTIO_GPU_RESP_OK_EDID ,/* error responses */ VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
@@ -291,6 +294,20 @@ struct virtio_gpu_resp_capset {__u8 capset_data[]; }; +/* VIRTIO_GPU_CMD_GET_EDID */ +struct virtio_gpu_get_edid { +struct virtio_gpu_ctrl_hdr hdr; +__le32 scanout; +}; + +/* VIRTIO_GPU_RESP_OK_EDID */ +struct virtio_gpu_resp_edid { +struct virtio_gpu_ctrl_hdr hdr; +__le32 scanout; +__le32 size; +__u8 edid[512 ]; +}; +#define VIRTIO_GPU_EVENT_DISPLAY (1 << 0)struct virtio_gpu_config {
Signature · 1 line
2.9.3
Gerd Hoffmann
maintainerPATCH 3/3 drm/virtio: add edid support
In reply to Gerd Hoffmannlinux guest driver implementation of the VIRTIO_GPU_F_EDID feature.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 3 ++ drivers/gpu/drm/virtio/virtgpu_display.c | 6 ++++ drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + drivers/gpu/drm/virtio/virtgpu_kms.c | 8 +++++ drivers/gpu/drm/virtio/virtgpu_vq.c | 59 ++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+)
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -0
@@ -112,6 +112,7 @@ struct virtio_gpu_output {struct drm_encoder enc;struct virtio_gpu_display_one info;struct virtio_gpu_update_cursor cursor; +struct edid *edid;int cur_x;int cur_y; };
@@ -194,6 +195,7 @@ struct virtio_gpu_device {spinlock_t ctx_id_idr_lock;bool has_virgl_3d; +bool has_edid;struct work_struct config_changed_work;
@@ -287,6 +289,7 @@ int virtio_gpu_cmd_get_capset_info(struct virtio_gpu_device *vgdev, int idx);int virtio_gpu_cmd_get_capset (struct virtio_gpu_device *vgdev,int idx,int version,struct virtio_gpu_drv_cap_cache **cache_p); +int virtio_gpu_cmd_get_edids (struct virtio_gpu_device *vgdev);void virtio_gpu_cmd_context_create (struct virtio_gpu_device *vgdev,uint32_t id,uint32_t nlen,const char *name); void virtio_gpu_cmd_context_destroy(struct virtio_gpu_device *vgdev,
drivers/gpu/drm/virtio/virtgpu_display.c +6 -0
@@ -168,6 +168,12 @@ static int virtio_gpu_conn_get_modes(struct drm_connector *connector)struct drm_display_mode *mode =NULL ;int count, width, height; +if (output->edid) { + count =drm_add_edid_modes (connector, output->edid); +if (count) +return count; + } + width =le32_to_cpu (output->info.r.width); height =le32_to_cpu (output->info.r.height); count =drm_add_modes_noedid (connector,XRES_MAX ,YRES_MAX );
drivers/gpu/drm/virtio/virtgpu_drv.c +1 -0
@@ -80,6 +80,7 @@ static unsigned int features[] = { */ VIRTIO_GPU_F_VIRGL, #endif + VIRTIO_GPU_F_EDID, }; static struct virtio_driver virtio_gpu_driver = { .feature_table = features,
drivers/gpu/drm/virtio/virtgpu_kms.c +8 -0
@@ -44,6 +44,8 @@ static void virtio_gpu_config_changed_work_func(struct work_struct *work) virtio_cread(vgdev->vdev, struct virtio_gpu_config, events_read, &events_read);if (events_read &VIRTIO_GPU_EVENT_DISPLAY ) { +if (vgdev->has_edid) +virtio_gpu_cmd_get_edids (vgdev);virtio_gpu_cmd_get_display_info (vgdev);drm_helper_hpd_irq_event (vgdev->ddev); events_clear |=VIRTIO_GPU_EVENT_DISPLAY ;
@@ -174,6 +176,10 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)#else DRM_INFO ("virgl 3d acceleration not supported by guest\n" );#endif +if (virtio_has_feature (vgdev->vdev,VIRTIO_GPU_F_EDID )) { + vgdev->has_edid = true; +DRM_INFO ("EDID support available.\n" ); + } ret =virtio_find_vqs (vgdev->vdev,2 , vqs, callbacks, names,NULL );if (ret) {
@@ -219,6 +225,8 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags)if (num_capsets)virtio_gpu_get_capsets (vgdev, num_capsets); +if (vgdev->has_edid) +virtio_gpu_cmd_get_edids (vgdev);virtio_gpu_cmd_get_display_info (vgdev);wait_event_timeout (vgdev->resp_wq, !vgdev->display_info_pending,5 *HZ );
drivers/gpu/drm/virtio/virtgpu_vq.c +59 -0
71 lines not on this page · raw message
Signature · 1 line
2.9.3