Acked-by: Mark Zhang <markz at nvidia.com>
Tested-by: Mark Zhang <markz at nvidia.com>
On my Tegra 30 cardhu. Thanks, Lucas.
Mark
On 12/12/2012 04:51 AM, Lucas Stach wrote:
> Fixes wrong picture offset observed when using HDMI output with a
> Technisat HD TV.
>
> Signed-off-by: Lucas Stach <dev at lynxeye.de>
> ---
> Captions are a bit confusing here. As the porch is always relative to
> the sync pulse, the left picture margin is actually the back_porch.
> ---
> drivers/gpu/drm/tegra/dc.c | 8 ++++----
> drivers/gpu/drm/tegra/hdmi.c | 6 +++---
> 2 Dateien ge?ndert, 7 Zeilen hinzugef?gt(+), 7 Zeilen entfernt(-)
>
> diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> index 0744103..54683e4 100644
> --- a/drivers/gpu/drm/tegra/dc.c
> +++ b/drivers/gpu/drm/tegra/dc.c
> @@ -102,12 +102,12 @@ static int tegra_dc_set_timings(struct tegra_dc *dc,
> ((mode->hsync_end - mode->hsync_start) << 0);
> tegra_dc_writel(dc, value, DC_DISP_SYNC_WIDTH);
>
> - value = ((mode->vsync_start - mode->vdisplay) << 16) |
> - ((mode->hsync_start - mode->hdisplay) << 0);
> - tegra_dc_writel(dc, value, DC_DISP_BACK_PORCH);
> -
> value = ((mode->vtotal - mode->vsync_end) << 16) |
> ((mode->htotal - mode->hsync_end) << 0);
> + tegra_dc_writel(dc, value, DC_DISP_BACK_PORCH);
> +
> + value = ((mode->vsync_start - mode->vdisplay) << 16) |
> + ((mode->hsync_start - mode->hdisplay) << 0);
> tegra_dc_writel(dc, value, DC_DISP_FRONT_PORCH);
>
> value = (mode->vdisplay << 16) | mode->hdisplay;
> diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
> index ab40164..81ea934 100644
> --- a/drivers/gpu/drm/tegra/hdmi.c
> +++ b/drivers/gpu/drm/tegra/hdmi.c
> @@ -479,7 +479,7 @@ static void tegra_hdmi_setup_avi_infoframe(struct
> tegra_hdmi *hdmi,
> return;
> }
>
> - h_front_porch = mode->htotal - mode->hsync_end;
> + h_front_porch = mode->hsync_start - mode->hdisplay;
> memset(&frame, 0, sizeof(frame));
> frame.r = HDMI_AVI_R_SAME;
>
> @@ -634,8 +634,8 @@ static int tegra_output_hdmi_enable(struct tegra_output
> *output)
>
> pclk = mode->clock * 1000;
> h_sync_width = mode->hsync_end - mode->hsync_start;
> - h_front_porch = mode->htotal - mode->hsync_end;
> - h_back_porch = mode->hsync_start - mode->hdisplay;
> + h_back_porch = mode->htotal - mode->hsync_end;
> + h_front_porch = mode->hsync_start - mode->hdisplay;
>
> err = regulator_enable(hdmi->vdd);
> if (err < 0) {
>
