Now that all users migrated to the new drmm_connector_hdmi_init() signature, supported_formats is provided through struct drm_connector_hdmi_funcs, a reference to which is already stored in drm_connector_hdmi.
Drop the redundant field from drm_connector_hdmi and point its users to hdmi.funcs->supported_formats instead. Tested-by: Diederik de Haas <[email protected]> # NanoPC-T6 LTS, Rock 5B Reviewed-by: Maxime Ripard <[email protected]> Signed-off-by: Cristian Ciocaltea <[email protected]> --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 3 ++- drivers/gpu/drm/drm_connector.c | 3 --- include/drm/drm_connector.h | 6 ------ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c index 289dce6c6281..687793c62d55 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -428,7 +428,8 @@ sink_supports_format_bpc(const struct drm_connector *connector, return false; } - if (!(connector->hdmi.supported_formats & BIT(format))) { + if (!connector->hdmi.funcs || + !(connector->hdmi.funcs->supported_formats & BIT(format))) { drm_dbg_kms(dev, "%s format unsupported by the connector.\n", drm_hdmi_connector_get_output_format_name(format)); return false; diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 4d580aaec247..db4d8daacfa0 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -617,9 +617,6 @@ int drmm_connector_hdmi_init(struct drm_device *dev, if (ret) return ret; - /* TODO: remove after conversion to new drmm_connector_hdmi_init() */ - connector->hdmi.supported_formats = hdmi_funcs->supported_formats; - /* * The supported HDMI version can be used to determinate the maximum * TMDS character rate allowed by the specification. Some controllers, diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 182946279194..d0aaa87dad7b 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -2192,12 +2192,6 @@ struct drm_connector_hdmi_audio { * struct drm_connector_hdmi - DRM Connector HDMI-related structure */ struct drm_connector_hdmi { - /** - * @supported_formats: Bitmask of @drm_output_color_format - * supported by the controller. - */ - unsigned long supported_formats; - /** * @max_tmds_char_rate: Maximum TMDS character rate, in Hz, * supported by the controller. -- 2.55.0
