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

drm: bridge: dw-hdmi: Pass drm_display_info to .mode_valid() 



Replace the drm_connector pointer passed to the .mode_valid() function
with a const drm_display_info pointer, as that's all the function should
need. Use the display info passed to the bridge .mode_valid() operation
instead of retrieving it from the connector, to prepare for make
connector creation optional.

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-16-laurent.pinchart+renesas@ideasonboard.com
parent 9bc78d6d

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

+2 −3
Original line number Diff line number Diff line
@@ -2769,7 +2769,6 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, 
{

	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;



	/* We don't support double-clocked modes */
@@ -2777,8 +2776,8 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge, 
		return MODE_BAD;



	if (pdata->mode_valid)

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

						connector, mode);

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

						mode);



	return mode_status;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static const struct drm_encoder_helper_funcs dw_hdmi_imx_encoder_helper_funcs = 


static enum drm_mode_status

imx6q_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		      struct drm_connector *con,

		      const struct drm_display_info *info,

		      const struct drm_display_mode *mode)

{

	if (mode->clock < 13500)
@@ -160,7 +160,7 @@ imx6q_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data, 


static enum drm_mode_status

imx6dl_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		       struct drm_connector *con,

		       const struct drm_display_info *info,

		       const struct drm_display_mode *mode)

{

	if (mode->clock < 13500)

drivers/gpu/drm/meson/meson_dw_hdmi.c

+10 −10
Original line number Diff line number Diff line
@@ -631,12 +631,12 @@ static irqreturn_t dw_hdmi_top_thread_irq(int irq, void *dev_id) 


static enum drm_mode_status

dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		   struct drm_connector *connector,

		   const struct drm_display_info *display_info,

		   const struct drm_display_mode *mode)

{

	struct meson_dw_hdmi *dw_hdmi = data;

	struct meson_drm *priv = dw_hdmi->priv;

	bool is_hdmi2_sink = connector->display_info.hdmi.scdc.supported;

	bool is_hdmi2_sink = display_info->hdmi.scdc.supported;

	unsigned int phy_freq;

	unsigned int vclk_freq;

	unsigned int venc_freq;
@@ -647,10 +647,10 @@ dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data, 
	DRM_DEBUG_DRIVER("Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode));



	/* If sink does not support 540MHz, reject the non-420 HDMI2 modes */

	if (connector->display_info.max_tmds_clock &&

	    mode->clock > connector->display_info.max_tmds_clock &&

	    !drm_mode_is_420_only(&connector->display_info, mode) &&

	    !drm_mode_is_420_also(&connector->display_info, mode))

	if (display_info->max_tmds_clock &&

	    mode->clock > display_info->max_tmds_clock &&

	    !drm_mode_is_420_only(display_info, mode) &&

	    !drm_mode_is_420_also(display_info, mode))

		return MODE_BAD;



	/* Check against non-VIC supported modes */
@@ -667,9 +667,9 @@ dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data, 
	vclk_freq = mode->clock;



	/* For 420, pixel clock is half unlike venc clock */

	if (drm_mode_is_420_only(&connector->display_info, mode) ||

	if (drm_mode_is_420_only(display_info, mode) ||

	    (!is_hdmi2_sink &&

	     drm_mode_is_420_also(&connector->display_info, mode)))

	     drm_mode_is_420_also(display_info, mode)))

		vclk_freq /= 2;



	/* TMDS clock is pixel_clock * 10 */
@@ -684,9 +684,9 @@ dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data, 


	/* VENC double pixels for 1080i, 720p and YUV420 modes */

	if (meson_venc_hdmi_venc_repeat(vic) ||

	    drm_mode_is_420_only(&connector->display_info, mode) ||

	    drm_mode_is_420_only(display_info, mode) ||

	    (!is_hdmi2_sink &&

	     drm_mode_is_420_also(&connector->display_info, mode)))

	     drm_mode_is_420_also(display_info, mode)))

		venc_freq *= 2;



	vclk_freq = max(venc_freq, hdmi_freq);

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static const struct rcar_hdmi_phy_params rcar_hdmi_phy_params[] = { 


static enum drm_mode_status

rcar_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,

		     struct drm_connector *connector,

		     const struct drm_display_info *info,

		     const struct drm_display_mode *mode)

{

	/*

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

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


static enum drm_mode_status

dw_hdmi_rockchip_mode_valid(struct dw_hdmi *hdmi, void *data,

			    struct drm_connector *connector,

			    const struct drm_display_info *info,

			    const struct drm_display_mode *mode)

{

	const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg;