Commit afc399f7 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/connector: make clear_infoframe callback mandatory for HDMI connectors 



We already require both hdmi_write_infoframe and hdmi_clear_infoframe
for bridges implementing DRM_BRIDGE_OP_HDMI. It makes sense to require
the clear_infoframes callback for HDMI connectors utilizing
drmm_connector_hdmi_init().

Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patch.msgid.link/20260107-limit-infoframes-2-v4-4-213d0d3bd490@oss.qualcomm.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent 63840997

drivers/gpu/drm/drm_connector.c

+4 −0
Original line number Diff line number Diff line
@@ -600,6 +600,10 @@ int drmm_connector_hdmi_init(struct drm_device *dev, 
	if (!(max_bpc == 8 || max_bpc == 10 || max_bpc == 12))

		return -EINVAL;



	if (!hdmi_funcs->clear_infoframe ||

	    !hdmi_funcs->write_infoframe)

		return -EINVAL;



	ret = drmm_connector_init(dev, connector, funcs, connector_type, ddc);

	if (ret)

		return ret;

drivers/gpu/drm/tests/drm_connector_test.c

+15 −0
Original line number Diff line number Diff line
@@ -25,7 +25,22 @@ struct drm_connector_init_priv { 
	struct i2c_adapter ddc;

};



static int accept_infoframe_clear_infoframe(struct drm_connector *connector,

					    enum hdmi_infoframe_type type)

{

	return 0;

}



static int accept_infoframe_write_infoframe(struct drm_connector *connector,

					    enum hdmi_infoframe_type type,

					    const u8 *buffer, size_t len)

{

	return 0;

}



static const struct drm_connector_hdmi_funcs dummy_hdmi_funcs = {

	.clear_infoframe = accept_infoframe_clear_infoframe,

	.write_infoframe = accept_infoframe_write_infoframe,

};



static const struct drm_connector_funcs dummy_funcs = {

drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c

+22 −0
Original line number Diff line number Diff line
@@ -78,7 +78,22 @@ static int set_connector_edid(struct kunit *test, struct drm_connector *connecto 
	return ret;

}



static int accept_infoframe_clear_infoframe(struct drm_connector *connector,

					    enum hdmi_infoframe_type type)

{

	return 0;

}



static int accept_infoframe_write_infoframe(struct drm_connector *connector,

					    enum hdmi_infoframe_type type,

					    const u8 *buffer, size_t len)

{

	return 0;

}



static const struct drm_connector_hdmi_funcs dummy_connector_hdmi_funcs = {

	.clear_infoframe = accept_infoframe_clear_infoframe,

	.write_infoframe = accept_infoframe_write_infoframe,

};



static enum drm_mode_status
@@ -91,6 +106,8 @@ reject_connector_tmds_char_rate_valid(const struct drm_connector *connector, 


static const struct drm_connector_hdmi_funcs reject_connector_hdmi_funcs = {

	.tmds_char_rate_valid	= reject_connector_tmds_char_rate_valid,

	.clear_infoframe = accept_infoframe_clear_infoframe,

	.write_infoframe = accept_infoframe_write_infoframe,

};



static enum drm_mode_status
@@ -103,6 +120,8 @@ reject_100mhz_connector_tmds_char_rate_valid(const struct drm_connector *connect 


static const struct drm_connector_hdmi_funcs reject_100mhz_connector_hdmi_funcs = {

	.tmds_char_rate_valid	= reject_100mhz_connector_tmds_char_rate_valid,

	.clear_infoframe = accept_infoframe_clear_infoframe,

	.write_infoframe = accept_infoframe_write_infoframe,

};



static int dummy_connector_get_modes(struct drm_connector *connector)
@@ -2441,6 +2460,7 @@ static int reject_avi_infoframe_write_infoframe(struct drm_connector *connector, 
}



static const struct drm_connector_hdmi_funcs reject_avi_infoframe_hdmi_funcs = {

	.clear_infoframe = accept_infoframe_clear_infoframe,

	.write_infoframe = reject_avi_infoframe_write_infoframe,

};
@@ -2543,6 +2563,7 @@ static int reject_hdr_infoframe_write_infoframe(struct drm_connector *connector, 
}



static const struct drm_connector_hdmi_funcs reject_hdr_infoframe_hdmi_funcs = {

	.clear_infoframe = accept_infoframe_clear_infoframe,

	.write_infoframe = reject_hdr_infoframe_write_infoframe,

};
@@ -2790,6 +2811,7 @@ static int reject_audio_infoframe_write_infoframe(struct drm_connector *connecto 
}



static const struct drm_connector_hdmi_funcs reject_audio_infoframe_hdmi_funcs = {

	.clear_infoframe = accept_infoframe_clear_infoframe,

	.write_infoframe = reject_audio_infoframe_write_infoframe,

};

include/drm/drm_connector.h

+1 −1
Original line number Diff line number Diff line
@@ -1253,7 +1253,7 @@ struct drm_connector_hdmi_funcs { 
	 * called multiple times, once for every disabled infoframe

	 * type.

	 *

	 * The @clear_infoframe callback is optional.

	 * The @clear_infoframe callback is mandatory.

	 *

	 * Returns:

	 * 0 on success, a negative error code otherwise