drm/bochs: add edid support.
Subsystems (3)
v2 cover drm/bochs: add edid support.
v2: add drm_connector_attach_edid_property() for per-driver opt-in.
Gerd Hoffmann (2):
drm: add drm_connector_attach_edid_property()
drm/bochs: add edid support.
drivers/gpu/drm/bochs/bochs.h | 1 + include/drm/drm_connector.h | 1 + drivers/gpu/drm/bochs/bochs_hw.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/bochs/bochs_kms.c | 18 +++++++++++++++--- drivers/gpu/drm/drm_connector.c | 20 ++++++++++++++++++++ 5 files changed, 75 insertions(+), 3 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/2 drm: add drm_connector_attach_edid_property()
drm_connector_init doesn't attach the edid property for some connector types, drm_connector_attach_edid_property() can be used to enable the edid property in these cases.
--- include/drm/drm_connector.h | 1 + drivers/gpu/drm/drm_connector.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)
include/drm/drm_connector.h +1 -0
@@ -1083,6 +1083,7 @@ int drm_connector_init(struct drm_device *dev,struct drm_connector *connector, const struct drm_connector_funcs *funcs, int connector_type); +void drm_connector_attach_edid_property (struct drm_connector *connector);int drm_connector_register (struct drm_connector *connector);void drm_connector_unregister (struct drm_connector *connector); int drm_connector_attach_encoder(struct drm_connector *connector,
drivers/gpu/drm/drm_connector.c +20 -0
@@ -291,6 +291,26 @@ int drm_connector_init(struct drm_device *dev,EXPORT_SYMBOL (drm_connector_init);/** +* drm_connector_attach_edid_property - attach edid property. +* @dev: DRM device +* @connector: the connector +* +* Some connector types like DRM_MODE_CONNECTOR_VIRTUAL do not get a +* edid property attached by default. This function can be used to +* explicitly enable the edid property in these cases. +* +*/ +void drm_connector_attach_edid_property (struct drm_connector *connector) +{ +struct drm_mode_config *config = &connector->dev->mode_config; + +drm_object_attach_property (&connector->base, + config->edid_property, +0 ); +} +EXPORT_SYMBOL (drm_connector_attach_edid_property); + +/** * drm_connector_attach_encoder - attach a connector to an encoder * @connector: connector to attach * @encoder: encoder to attach @connector to
Signature · 1 line
2.9.3
Re: [PATCH v2 1/2] drm: add drm_connector_attach_edid_property()
Quoted 28 lines · Gerd Hoffmann
drm_connector_initdoesn't attach the edid property for some connector types,drm_connector_attach_edid_property()can be used to enable the edid property in these cases.Signed-off-by Gerd Hoffmann <[email protected]>--- include/drm/drm_connector.h | 1 + drivers/gpu/drm/drm_connector.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)include/drm/drm_connector.h +1
-0@@ -1083,6 +1083,7 @@ int drm_connector_init(struct drm_device *dev,struct drm_connector *connector, const struct drm_connector_funcs *funcs, int connector_type); +void drm_connector_attach_edid_property (struct drm_connector *connector);int drm_connector_register (struct drm_connector *connector);void drm_connector_unregister (struct drm_connector *connector); int drm_connector_attach_encoder(struct drm_connector *connector,drivers/gpu/drm/drm_connector.c +0
-0@@ -291,6 +291,26 @@ int drm_connector_init(struct drm_device *dev,EXPORT_SYMBOL (drm_connector_init);
drivers/gpu/drm/drm_connector.c int drm_connector_init(struct drm_device *dev, · line 301
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +8
-0/** +* drm_connector_attach_edid_property - attach edid property. +* @dev: DRM device +* @connector: the connector +* +* Some connector types like DRM_MODE_CONNECTOR_VIRTUAL do not get a +* edid property attached by default. This function can be used to +* explicitly enable the edid property in these cases. +*
Surplus line. I'd also use this in the connector setup function, so it's a notch easier to discover. With that:
Quoted 22 lines
drivers/gpu/drm/drm_connector.c +12
-0+*/ +void drm_connector_attach_edid_property (struct drm_connector *connector) +{ +struct drm_mode_config *config = &connector->dev->mode_config; + +drm_object_attach_property (&connector->base, + config->edid_property, +0 ); +} +EXPORT_SYMBOL (drm_connector_attach_edid_property); + +/** * drm_connector_attach_encoder - attach a connector to an encoder * @connector: connector to attach * @encoder: encoder to attach @connector to Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
PATCH v2 2/2 drm/bochs: add edid support.
In reply to Gerd HoffmannRecent qemu (latest master branch, upcoming 3.1 release) got support for EDID data. This patch adds guest driver support.
EDID support in qemu is not (yet) enabled by default, so please use 'qemu -device VGA,edid=on' for testing.
--- drivers/gpu/drm/bochs/bochs.h | 1 + drivers/gpu/drm/bochs/bochs_hw.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/bochs/bochs_kms.c | 18 +++++++++++++++--- 3 files changed, 54 insertions(+), 3 deletions(-)
drivers/gpu/drm/bochs/bochs.h +1 -0
@@ -70,6 +70,7 @@ struct bochs_device {u16 yres_virtual;u32 stride;u32 bpp; +struct edid *edid;/* drm */ struct drm_device *dev;
drivers/gpu/drm/bochs/bochs_hw.c +38 -0
@@ -47,6 +47,41 @@ static void bochs_dispi_write(struct bochs_device *bochs, u16 reg, u16 val) } } +static int bochs_load_edid (struct bochs_device *bochs) +{ +uint8_t *blob; +size_t i, len; +uint8_t num_exts; + +if (!bochs->mmio) +return -1 ; + +if ((readb (bochs->mmio+0 ) !=0x00 || +readb (bochs->mmio+1 ) !=0xff )) +return -1 ; + + num_exts =readb (bochs->mmio +126 ); + len =EDID_LENGTH * (1 + num_exts); +if (len >0x400 /* vga register offset */ ) +return -1 ; + +kfree (bochs->edid); + bochs->edid =kmalloc (len,GFP_KERNEL ); + blob = (void *)bochs->edid; +for (i =0 ; i < len; i++) { + blob[i] =readb (bochs->mmio+i); + } + +if (!drm_edid_is_valid (bochs->edid)) { +DRM_ERROR ("EDID is not valid, ignoring.\n" ); +kfree (bochs->edid); + bochs->edid =NULL ; +return -1 ; + } + +return 0 ; +} +int bochs_hw_init (struct drm_device *dev,uint32_t flags) {struct bochs_device *bochs = dev->dev_private;
@@ -133,6 +168,9 @@ int bochs_hw_init(struct drm_device *dev, uint32_t flags) } noext: +if (bochs_load_edid (bochs) ==0 ) +DRM_INFO ("Found EDID data blob.\n" ); +return 0 ; }
drivers/gpu/drm/bochs/bochs_kms.c +15 -3
@@ -181,10 +181,17 @@ static void bochs_encoder_init(struct drm_device *dev)static int bochs_connector_get_modes (struct drm_connector *connector) { -int count; +struct bochs_device *bochs = + container_of(connector, struct bochs_device, connector); +int count =0 ; - count =drm_add_modes_noedid (connector,8192 ,8192 ); -drm_set_preferred_mode (connector, defx, defy); +if (bochs->edid) + count =drm_add_edid_modes (connector, bochs->edid); + +if (!count) { + count =drm_add_modes_noedid (connector,8192 ,8192 ); +drm_set_preferred_mode (connector, defx, defy); + }return count; }
@@ -239,6 +246,11 @@ static void bochs_connector_init(struct drm_device *dev)drm_connector_helper_add (connector, &bochs_connector_connector_helper_funcs);drm_connector_register (connector); + +if (bochs->edid) { +drm_connector_attach_edid_property (connector); +drm_connector_update_edid_property (connector, bochs->edid); + } }
Signature · 1 line
2.9.3