In preparation for adding hotpluggable bridges into the drm_bridge_connector, we need connectors to be created dynamically, both regular connectors and HDMI ones. drm_connector_init() already has a dynamic variant, add one for HDMI connectors too.
Signed-off-by: Luca Ceresoli <[email protected]> --- drivers/gpu/drm/drm_connector.c | 50 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 9 ++++++++ 2 files changed, 59 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 37ed73300a18..5e7a3a438e5d 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -658,6 +658,56 @@ int drmm_connector_hdmi_init(struct drm_device *dev, } EXPORT_SYMBOL(drmm_connector_hdmi_init); +/** + * drm_connector_hdmi_dynamic_init - Init a preallocated dynamic HDMI connector + * @dev: DRM device + * @connector: A pointer to the HDMI connector to init + * @vendor: HDMI Controller Vendor name + * @product: HDMI Controller Product name + * @funcs: callbacks for this connector + * @hdmi_funcs: HDMI-related callbacks for this connector + * @connector_type: user visible type of the connector + * @ddc: optional pointer to the associated ddc adapter + * @supported_formats: Bitmask of @hdmi_colorspace listing supported output formats + * @max_bpc: Maximum bits per char the HDMI connector supports + * + * Initialises a preallocated dynamic HDMI connector. Connectors can be + * subclassed as part of driver connector objects. + * + * See drm_connector_dynamic_init(), the same constraints apply here. This + * is just the HDMI version. + * + * Returns: + * Zero on success, error code on failure. + */ +int drm_connector_hdmi_dynamic_init(struct drm_device *dev, + struct drm_connector *connector, + const char *vendor, const char *product, + const struct drm_connector_funcs *funcs, + const struct drm_connector_hdmi_funcs *hdmi_funcs, + int connector_type, + struct i2c_adapter *ddc, + unsigned long supported_formats, + unsigned int max_bpc) +{ + int ret; + + ret = drm_connector_hdmi_sanity_checks(connector, vendor, product, hdmi_funcs, + connector_type, supported_formats, max_bpc); + if (ret) + return ret; + + ret = drm_connector_dynamic_init(dev, connector, funcs, connector_type, ddc); + if (ret) + return ret; + + drm_connector_hdmi_init(connector, vendor, product, + hdmi_funcs, supported_formats, max_bpc); + + return 0; +} +EXPORT_SYMBOL(drm_connector_hdmi_dynamic_init); + /** * drm_connector_attach_edid_property - attach edid property. * @connector: the connector diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 5ad62c207d00..1f5dba947748 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -2442,6 +2442,15 @@ int drmm_connector_hdmi_init(struct drm_device *dev, struct i2c_adapter *ddc, unsigned long supported_formats, unsigned int max_bpc); +int drm_connector_hdmi_dynamic_init(struct drm_device *dev, + struct drm_connector *connector, + const char *vendor, const char *product, + const struct drm_connector_funcs *funcs, + const struct drm_connector_hdmi_funcs *hdmi_funcs, + int connector_type, + struct i2c_adapter *ddc, + unsigned long supported_formats, + unsigned int max_bpc); void drm_connector_attach_edid_property(struct drm_connector *connector); int drm_connector_register(struct drm_connector *connector); int drm_connector_dynamic_register(struct drm_connector *connector); -- 2.54.0
