Skip to content

Commit 49da7e5

Browse files
Laurent Pinchartsravnborg
authored andcommitted
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: Laurent Pinchart <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Signed-off-by: Sam Ravnborg <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20200526011505.31884-13-laurent.pinchart+renesas@ideasonboard.com
1 parent 96591a4 commit 49da7e5

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,7 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi)
15141514

15151515
/* Write to the PHY as configured by the platform */
15161516
if (pdata->configure_phy)
1517-
ret = pdata->configure_phy(hdmi, pdata, mpixelclock);
1517+
ret = pdata->configure_phy(hdmi, pdata->priv_data, mpixelclock);
15181518
else
15191519
ret = phy->configure(hdmi, pdata, mpixelclock);
15201520
if (ret) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ rcar_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,
5252
return MODE_OK;
5353
}
5454

55-
static int rcar_hdmi_phy_configure(struct dw_hdmi *hdmi,
56-
const struct dw_hdmi_plat_data *pdata,
55+
static int rcar_hdmi_phy_configure(struct dw_hdmi *hdmi, void *data,
5756
unsigned long mpixelclock)
5857
{
5958
const struct rcar_hdmi_phy_params *params = rcar_hdmi_phy_params;

include/drm/bridge/dw_hdmi.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ struct dw_hdmi_plat_data {
151151
const struct dw_hdmi_mpll_config *mpll_cfg;
152152
const struct dw_hdmi_curr_ctrl *cur_ctr;
153153
const struct dw_hdmi_phy_config *phy_config;
154-
int (*configure_phy)(struct dw_hdmi *hdmi,
155-
const struct dw_hdmi_plat_data *pdata,
154+
int (*configure_phy)(struct dw_hdmi *hdmi, void *data,
156155
unsigned long mpixelclock);
157156
};
158157

0 commit comments

Comments
 (0)