Commit 02bb63d1 authored by Andy Yan's avatar Andy Yan Committed by Dmitry Baryshkov
Browse files

drm/bridge: Make dp/hdmi_audio_* callback keep the same paramter order with get_modes 



Make the dp/hdmi_audio_* callback maintain the same parameter order as
get_modes and edid_read: first the bridge, then the connector.

Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250703125027.311109-2-andyshrk@163.com


[DB: added the chunk to the cdn-dp driver]
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent a6cfa4c8

drivers/gpu/drm/bridge/adv7511/adv7511.h

+8 −8
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ static inline struct adv7511 *bridge_to_adv7511(struct drm_bridge *bridge) 
}



#ifdef CONFIG_DRM_I2C_ADV7511_CEC

int adv7511_cec_init(struct drm_connector *connector,

		     struct drm_bridge *bridge);

int adv7511_cec_init(struct drm_bridge *bridge,

		     struct drm_connector *connector);

int adv7511_cec_enable(struct drm_bridge *bridge, bool enable);

int adv7511_cec_log_addr(struct drm_bridge *bridge, u8 addr);

int adv7511_cec_transmit(struct drm_bridge *bridge, u8 attempts,
@@ -424,12 +424,12 @@ int adv7533_attach_dsi(struct adv7511 *adv); 
int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv);



#ifdef CONFIG_DRM_I2C_ADV7511_AUDIO

int adv7511_hdmi_audio_startup(struct drm_connector *connector,

			       struct drm_bridge *bridge);

void adv7511_hdmi_audio_shutdown(struct drm_connector *connector,

				 struct drm_bridge *bridge);

int adv7511_hdmi_audio_prepare(struct drm_connector *connector,

			       struct drm_bridge *bridge,

int adv7511_hdmi_audio_startup(struct drm_bridge *bridge,

			       struct drm_connector *connector);

void adv7511_hdmi_audio_shutdown(struct drm_bridge *bridge,

				 struct drm_connector *connector);

int adv7511_hdmi_audio_prepare(struct drm_bridge *bridge,

			       struct drm_connector *connector,

			       struct hdmi_codec_daifmt *fmt,

			       struct hdmi_codec_params *hparms);

#else /*CONFIG_DRM_I2C_ADV7511_AUDIO */

drivers/gpu/drm/bridge/adv7511/adv7511_audio.c

+6 −6
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ static int adv7511_update_cts_n(struct adv7511 *adv7511) 
	return 0;

}



int adv7511_hdmi_audio_prepare(struct drm_connector *connector,

			       struct drm_bridge *bridge,

int adv7511_hdmi_audio_prepare(struct drm_bridge *bridge,

			       struct drm_connector *connector,

			       struct hdmi_codec_daifmt *fmt,

			       struct hdmi_codec_params *hparms)

{
@@ -168,8 +168,8 @@ int adv7511_hdmi_audio_prepare(struct drm_connector *connector, 
	return 0;

}



int adv7511_hdmi_audio_startup(struct drm_connector *connector,

			       struct drm_bridge *bridge)

int adv7511_hdmi_audio_startup(struct drm_bridge *bridge,

			       struct drm_connector *connector)

{

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);
@@ -206,8 +206,8 @@ int adv7511_hdmi_audio_startup(struct drm_connector *connector, 
	return 0;

}



void adv7511_hdmi_audio_shutdown(struct drm_connector *connector,

				 struct drm_bridge *bridge)

void adv7511_hdmi_audio_shutdown(struct drm_bridge *bridge,

				 struct drm_connector *connector)

{

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);

drivers/gpu/drm/bridge/adv7511/adv7511_cec.c

+2 −2
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ static int adv7511_cec_parse_dt(struct device *dev, struct adv7511 *adv7511) 
	return 0;

}



int adv7511_cec_init(struct drm_connector *connector,

		     struct drm_bridge *bridge)

int adv7511_cec_init(struct drm_bridge *bridge,

		     struct drm_connector *connector)

{

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);

	struct device *dev = &adv7511->i2c_main->dev;

drivers/gpu/drm/bridge/lontium-lt9611.c

+6 −6
Original line number Diff line number Diff line
@@ -936,8 +936,8 @@ lt9611_hdmi_tmds_char_rate_valid(const struct drm_bridge *bridge, 
	return MODE_OK;

}



static int lt9611_hdmi_audio_startup(struct drm_connector *connector,

				     struct drm_bridge *bridge)

static int lt9611_hdmi_audio_startup(struct drm_bridge *bridge,

				     struct drm_connector *connector)

{

	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
@@ -952,8 +952,8 @@ static int lt9611_hdmi_audio_startup(struct drm_connector *connector, 
	return 0;

}



static int lt9611_hdmi_audio_prepare(struct drm_connector *connector,

				     struct drm_bridge *bridge,

static int lt9611_hdmi_audio_prepare(struct drm_bridge *bridge,

				     struct drm_connector *connector,

				     struct hdmi_codec_daifmt *fmt,

				     struct hdmi_codec_params *hparms)

{
@@ -974,8 +974,8 @@ static int lt9611_hdmi_audio_prepare(struct drm_connector *connector, 
								       &hparms->cea);

}



static void lt9611_hdmi_audio_shutdown(struct drm_connector *connector,

				       struct drm_bridge *bridge)

static void lt9611_hdmi_audio_shutdown(struct drm_bridge *bridge,

				       struct drm_connector *connector)

{

	struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c

+6 −6
Original line number Diff line number Diff line
@@ -440,8 +440,8 @@ static void dw_hdmi_qp_set_sample_rate(struct dw_hdmi_qp *hdmi, unsigned long lo 
	dw_hdmi_qp_set_cts_n(hdmi, cts, n);

}



static int dw_hdmi_qp_audio_enable(struct drm_connector *connector,

				   struct drm_bridge *bridge)

static int dw_hdmi_qp_audio_enable(struct drm_bridge *bridge,

				   struct drm_connector *connector)

{

	struct dw_hdmi_qp *hdmi = dw_hdmi_qp_from_bridge(bridge);
@@ -451,8 +451,8 @@ static int dw_hdmi_qp_audio_enable(struct drm_connector *connector, 
	return 0;

}



static int dw_hdmi_qp_audio_prepare(struct drm_connector *connector,

				    struct drm_bridge *bridge,

static int dw_hdmi_qp_audio_prepare(struct drm_bridge *bridge,

				    struct drm_connector *connector,

				    struct hdmi_codec_daifmt *fmt,

				    struct hdmi_codec_params *hparms)

{
@@ -497,8 +497,8 @@ static void dw_hdmi_qp_audio_disable_regs(struct dw_hdmi_qp *hdmi) 
		       AVP_DATAPATH_PACKET_AUDIO_SWDISABLE, GLOBAL_SWDISABLE);

}



static void dw_hdmi_qp_audio_disable(struct drm_connector *connector,

				     struct drm_bridge *bridge)

static void dw_hdmi_qp_audio_disable(struct drm_bridge *bridge,

				     struct drm_connector *connector)

{

	struct dw_hdmi_qp *hdmi = dw_hdmi_qp_from_bridge(bridge);