Skip to content

Commit

Permalink
drm: bridge: dw-hdmi: Pass drm_display_info to .mode_valid()
Browse files Browse the repository at this point in the history 
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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200526011505.31884-16-laurent.pinchart+renesas@ideasonboard.com
  • Loading branch information
Laurent Pinchart authored and Sam Ravnborg committed Jun 23, 2020
1 parent 9bc78d6 commit af05bba
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 22 deletions.
5 changes: 2 additions & 3 deletions drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2769,16 +2769,15 @@ 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 */
if (mode->flags & DRM_MODE_FLAG_DBLCLK)
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;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/imx/dw_hdmi-imx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions drivers/gpu/drm/meson/meson_dw_hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 */
Expand All @@ -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 */
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sun8i_dw_hdmi_encoder_helper_funcs = {

static enum drm_mode_status
sun8i_dw_hdmi_mode_valid_a83t(struct dw_hdmi *hdmi, void *data,
struct drm_connector *connector,
const struct drm_display_info *info,
const struct drm_display_mode *mode)
{
if (mode->clock > 297000)
Expand All @@ -43,7 +43,7 @@ sun8i_dw_hdmi_mode_valid_a83t(struct dw_hdmi *hdmi, void *data,

static enum drm_mode_status
sun8i_dw_hdmi_mode_valid_h6(struct dw_hdmi *hdmi, void *data,
struct drm_connector *connector,
const struct drm_display_info *info,
const struct drm_display_mode *mode)
{
/*
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ struct sun8i_hdmi_phy {

struct sun8i_dw_hdmi_quirks {
enum drm_mode_status (*mode_valid)(struct dw_hdmi *hdmi, void *data,
struct drm_connector *connector,
const struct drm_display_info *info,
const struct drm_display_mode *mode);
unsigned int set_rate : 1;
unsigned int use_drm_infoframe : 1;
Expand Down
4 changes: 2 additions & 2 deletions include/drm/bridge/dw_hdmi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <sound/hdmi-codec.h>

struct drm_connector;
struct drm_display_info;
struct drm_display_mode;
struct drm_encoder;
struct dw_hdmi;
Expand Down Expand Up @@ -137,7 +137,7 @@ struct dw_hdmi_plat_data {

/* Platform-specific mode validation (optional). */
enum drm_mode_status (*mode_valid)(struct dw_hdmi *hdmi, void *data,
struct drm_connector *connector,
const struct drm_display_info *info,
const struct drm_display_mode *mode);

/* Vendor PHY support */
Expand Down

0 comments on commit af05bba

Please sign in to comment.