All callers have been converted to the new drmm_connector_hdmi_init() signature. Remove the transitional drmm_connector_hdmi_ini2() function, its declaration, its EXPORT_SYMBOL() and its kernel-doc.
Tested-by: Diederik de Haas <[email protected]> # NanoPC-T6 LTS, Rock 5B Signed-off-by: Cristian Ciocaltea <[email protected]> --- drivers/gpu/drm/drm_connector.c | 106 ---------------------------------------- include/drm/drm_connector.h | 9 ---- 2 files changed, 115 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index a18410faf040..b2e8d99c0e9a 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -696,112 +696,6 @@ int drmm_connector_hdmi_init(struct drm_device *dev, } EXPORT_SYMBOL(drmm_connector_hdmi_init); -/** - * drmm_connector_hdmi_ini2 - Init a preallocated 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 @drm_output_color_format listing supported output formats - * @max_bpc: Maximum bits per char the HDMI connector supports - * - * Initialises a preallocated HDMI connector. Connectors can be - * subclassed as part of driver connector objects. - * - * Cleanup is automatically handled with a call to - * drm_connector_cleanup() in a DRM-managed action. - * - * The connector structure should be allocated with drmm_kzalloc(). - * - * The @drm_connector_funcs.destroy hook must be NULL. - * - * Returns: - * Zero on success, error code on failure. - */ -int drmm_connector_hdmi_ini2(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; - - if (!vendor || !product) - return -EINVAL; - - if ((strlen(vendor) > DRM_CONNECTOR_HDMI_VENDOR_LEN) || - (strlen(product) > DRM_CONNECTOR_HDMI_PRODUCT_LEN)) - return -EINVAL; - - if (!(connector_type == DRM_MODE_CONNECTOR_HDMIA || - connector_type == DRM_MODE_CONNECTOR_HDMIB)) - return -EINVAL; - - if (!supported_formats || !(supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444))) - return -EINVAL; - - if (connector->ycbcr_420_allowed != !!(supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420))) - return -EINVAL; - - if (!(max_bpc == 8 || max_bpc == 10 || max_bpc == 12)) - return -EINVAL; - - if (!hdmi_funcs->avi.clear_infoframe || - !hdmi_funcs->avi.write_infoframe || - !hdmi_funcs->hdmi.clear_infoframe || - !hdmi_funcs->hdmi.write_infoframe) - return -EINVAL; - - ret = drmm_connector_init(dev, connector, funcs, connector_type, ddc); - if (ret) - return ret; - - connector->hdmi.supported_formats = supported_formats; - strtomem_pad(connector->hdmi.vendor, vendor, 0); - strtomem_pad(connector->hdmi.product, product, 0); - - /* - * drm_connector_attach_max_bpc_property() requires the - * connector to have a state. - */ - if (connector->funcs->atomic_create_state) { - struct drm_connector_state *state; - - state = connector->funcs->atomic_create_state(connector); - if (IS_ERR(state)) - return PTR_ERR(state); - - connector->state = state; - } else if (connector->funcs->reset) { - connector->funcs->reset(connector); - if (!connector->state) - return -ENOMEM; - } - - drm_connector_attach_max_bpc_property(connector, 8, max_bpc); - connector->max_bpc = max_bpc; - - if (max_bpc > 8) - drm_connector_attach_hdr_output_metadata_property(connector); - - ret = drm_connector_attach_color_format_property(connector, supported_formats); - if (ret) - return ret; - - connector->hdmi.funcs = hdmi_funcs; - - return 0; -} -EXPORT_SYMBOL(drmm_connector_hdmi_ini2); - /** * 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 89a140d6f064..2ad8d1611e84 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -2676,15 +2676,6 @@ int drmm_connector_hdmi_init(struct drm_device *dev, const struct drm_connector_hdmi_funcs *hdmi_funcs, int connector_type, struct i2c_adapter *ddc); -int drmm_connector_hdmi_ini2(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.55.0
