diff options
Diffstat (limited to 'drivers/gpu/drm/meson/meson_dw_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/meson/meson_dw_hdmi.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index 807111ebfdd9..bc25001b8207 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c | |||
@@ -365,7 +365,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data, | |||
365 | unsigned int wr_clk = | 365 | unsigned int wr_clk = |
366 | readl_relaxed(priv->io_base + _REG(VPU_HDMI_SETTING)); | 366 | readl_relaxed(priv->io_base + _REG(VPU_HDMI_SETTING)); |
367 | 367 | ||
368 | DRM_DEBUG_DRIVER("%d:\"%s\"\n", mode->base.id, mode->name); | 368 | DRM_DEBUG_DRIVER("\"%s\"\n", mode->name); |
369 | 369 | ||
370 | /* Enable clocks */ | 370 | /* Enable clocks */ |
371 | regmap_update_bits(priv->hhi, HHI_HDMI_CLK_CNTL, 0xffff, 0x100); | 371 | regmap_update_bits(priv->hhi, HHI_HDMI_CLK_CNTL, 0xffff, 0x100); |
@@ -555,12 +555,7 @@ dw_hdmi_mode_valid(struct drm_connector *connector, | |||
555 | int vic = drm_match_cea_mode(mode); | 555 | int vic = drm_match_cea_mode(mode); |
556 | enum drm_mode_status status; | 556 | enum drm_mode_status status; |
557 | 557 | ||
558 | DRM_DEBUG_DRIVER("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x\n", | 558 | DRM_DEBUG_DRIVER("Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode)); |
559 | mode->base.id, mode->name, mode->vrefresh, mode->clock, | ||
560 | mode->hdisplay, mode->hsync_start, | ||
561 | mode->hsync_end, mode->htotal, | ||
562 | mode->vdisplay, mode->vsync_start, | ||
563 | mode->vsync_end, mode->vtotal, mode->type, mode->flags); | ||
564 | 559 | ||
565 | /* Check against non-VIC supported modes */ | 560 | /* Check against non-VIC supported modes */ |
566 | if (!vic) { | 561 | if (!vic) { |
@@ -650,8 +645,7 @@ static void meson_venc_hdmi_encoder_mode_set(struct drm_encoder *encoder, | |||
650 | struct meson_drm *priv = dw_hdmi->priv; | 645 | struct meson_drm *priv = dw_hdmi->priv; |
651 | int vic = drm_match_cea_mode(mode); | 646 | int vic = drm_match_cea_mode(mode); |
652 | 647 | ||
653 | DRM_DEBUG_DRIVER("%d:\"%s\" vic %d\n", | 648 | DRM_DEBUG_DRIVER("\"%s\" vic %d\n", mode->name, vic); |
654 | mode->base.id, mode->name, vic); | ||
655 | 649 | ||
656 | /* VENC + VENC-DVI Mode setup */ | 650 | /* VENC + VENC-DVI Mode setup */ |
657 | meson_venc_hdmi_mode_set(priv, vic, mode); | 651 | meson_venc_hdmi_mode_set(priv, vic, mode); |