Commit 96591a4b authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Sam Ravnborg
Browse files

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



Platform glue drivers for dw_hdmi may need to access device-specific
data from their .mode_valid() implementation. They currently have no
clean way to do so, and one driver hacks around it by accessing the
dev_private data of the drm_device retrieved from the connector.

Add a priv_data void pointer to the dw_hdmi_plat_data structure, and
pass it to the .mode_valid() function.

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-12-laurent.pinchart+renesas@ideasonboard.com
parent 12c683e1

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

+4 −2
Original line number Diff line number Diff line
@@ -2771,6 +2771,7 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, 
			  const struct drm_display_mode *mode)

{

	struct dw_hdmi *hdmi = bridge->driver_private;

	const struct dw_hdmi_plat_data *pdata = hdmi->plat_data;

	struct drm_connector *connector = &hdmi->connector;

	enum drm_mode_status mode_status = MODE_OK;
@@ -2778,8 +2779,9 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, 
	if (mode->flags & DRM_MODE_FLAG_DBLCLK)

		return MODE_BAD;



	if (hdmi->plat_data->mode_valid)

		mode_status = hdmi->plat_data->mode_valid(connector, mode);

	if (pdata->mode_valid)

		mode_status = pdata->mode_valid(hdmi, pdata->priv_data,

						connector, mode);



	return mode_status;

}

drivers/gpu/drm/imx/dw_hdmi-imx.c

+4 −2
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = 
};



static enum drm_mode_status

imx6q_hdmi_mode_valid(struct drm_connector *con,

imx6q_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		      struct drm_connector *con,

		      const struct drm_display_mode *mode)

{

	if (mode->clock < 13500)
@@ -158,7 +159,8 @@ imx6q_hdmi_mode_valid(struct drm_connector *con, 
}



static enum drm_mode_status

imx6dl_hdmi_mode_valid(struct drm_connector *con,

imx6dl_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		       struct drm_connector *con,

		       const struct drm_display_mode *mode)

{

	if (mode->clock < 13500)

drivers/gpu/drm/meson/meson_dw_hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -630,7 +630,8 @@ static irqreturn_t dw_hdmi_top_thread_irq(int irq, void *dev_id) 
}



static enum drm_mode_status

dw_hdmi_mode_valid(struct drm_connector *connector,

dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		   struct drm_connector *connector,

		   const struct drm_display_mode *mode)

{

	struct meson_drm *priv = connector->dev->dev_private;

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

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ static const struct rcar_hdmi_phy_params rcar_hdmi_phy_params[] = { 
};



static enum drm_mode_status

rcar_hdmi_mode_valid(struct drm_connector *connector,

rcar_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		     struct drm_connector *connector,

		     const struct drm_display_mode *mode)

{

	/*

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ static int rockchip_hdmi_parse_dt(struct rockchip_hdmi *hdmi) 
}



static enum drm_mode_status

dw_hdmi_rockchip_mode_valid(struct drm_connector *connector,

dw_hdmi_rockchip_mode_valid(struct dw_hdmi *hdmi, void *data,

			    struct drm_connector *connector,

			    const struct drm_display_mode *mode)

{

	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE