On 26/05/2020 03:14, Laurent Pinchart wrote:
> 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 <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
> drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 3 +--
> include/drm/bridge/dw_hdmi.h | 3 +--
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index 2b3f203cf467..6edb60e6c784 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -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) {
> diff --git a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> index 4d837a4d302d..d0dffe55a7cb 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
> @@ -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;
> diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> index 66a811f75b91..09348c9cbd11 100644
> --- a/include/drm/bridge/dw_hdmi.h
> +++ b/include/drm/bridge/dw_hdmi.h
> @@ -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);
> };
>
>
Reviewed-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
