Commit 49da7e5d authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Sam Ravnborg
Browse files

drm: bridge: dw-hdmi: Pass private data pointer to .configure_phy() 



The .configure_phy() operation takes a dw_hdmi_plat_data pointer as a
context argument. This differs from .mode_valid() that takes a custom
private context pointer, causing possible confusion. Make the
dw_hdmi_plat_data operations more consistent by passing the private
context pointer to .configure_phy() as well.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200526011505.31884-13-laurent.pinchart+renesas@ideasonboard.com
parent 96591a4b

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

+1 −1
Original line number Diff line number Diff line
@@ -1514,7 +1514,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi) 


	/* Write to the PHY as configured by the platform */

	if (pdata->configure_phy)

		ret = pdata->configure_phy(hdmi, pdata, mpixelclock);

		ret = pdata->configure_phy(hdmi, pdata->priv_data, mpixelclock);

	else

		ret = phy->configure(hdmi, pdata, mpixelclock);

	if (ret) {

drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c

+1 −2
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ rcar_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data, 
	return MODE_OK;

}



static int rcar_hdmi_phy_configure(struct dw_hdmi *hdmi,

				   const struct dw_hdmi_plat_data *pdata,

static int rcar_hdmi_phy_configure(struct dw_hdmi *hdmi, void *data,

				   unsigned long mpixelclock)

{

	const struct rcar_hdmi_phy_params *params = rcar_hdmi_phy_params;

include/drm/bridge/dw_hdmi.h

+1 −2
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ struct dw_hdmi_plat_data { 
	const struct dw_hdmi_mpll_config *mpll_cfg;

	const struct dw_hdmi_curr_ctrl *cur_ctr;

	const struct dw_hdmi_phy_config *phy_config;

	int (*configure_phy)(struct dw_hdmi *hdmi,

			     const struct dw_hdmi_plat_data *pdata,

	int (*configure_phy)(struct dw_hdmi *hdmi, void *data,

			     unsigned long mpixelclock);

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE