[PATCH] drm: tegra: check HDMI sink capability

[PATCH] drm: tegra: check HDMI sink capability

[Lucas Stach]

Check if sink is HDMI capable when enabling an output. This disables
HDMI audio/infoframes if we are talking to a plain DVI sink. All things
except this check are already in place.

Signed-off-by: Lucas Stach <dev-8ppwABl0HbeELgA04lAiVw@public.gmane.org>
---
 drivers/gpu/drm/tegra/hdmi.c | 3 +++
 1 Datei geändert, 3 Zeilen hinzugefügt(+)

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index ab40164..32ea7d4 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -673,6 +673,9 @@ static int tegra_output_hdmi_enable(struct tegra_output *output)
 	usleep_range(1000, 2000);
 	tegra_periph_reset_deassert(hdmi->clk);
 
+	/* if the connected sink is not HDMI capable fall back to plain DVI */
+	hdmi->dvi = !drm_detect_hdmi_monitor((struct edid *)output->edid);
+
 	tegra_dc_writel(dc, VSYNC_H_POSITION(1),
 			DC_DISP_DISP_TIMING_OPTIONS);
 	tegra_dc_writel(dc, DITHER_CONTROL_DISABLE | BASE_COLOR_SIZE888,
-- 
1.7.11.7

Re: [PATCH] drm: tegra: check HDMI sink capability

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]

On Mon, Dec 17, 2012 at 06:59:23PM +0100, Lucas Stach wrote:
> Check if sink is HDMI capable when enabling an output. This disables
> HDMI audio/infoframes if we are talking to a plain DVI sink. All things
> except this check are already in place.
> 
> Signed-off-by: Lucas Stach <dev-8ppwABl0HbeELgA04lAiVw@public.gmane.org>
> ---
>  drivers/gpu/drm/tegra/hdmi.c | 3 +++
>  1 Datei geändert, 3 Zeilen hinzugefügt(+)
> 
> diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
> index ab40164..32ea7d4 100644
> --- a/drivers/gpu/drm/tegra/hdmi.c
> +++ b/drivers/gpu/drm/tegra/hdmi.c
> @@ -673,6 +673,9 @@ static int tegra_output_hdmi_enable(struct tegra_output *output)
>  	usleep_range(1000, 2000);
>  	tegra_periph_reset_deassert(hdmi->clk);
>  
> +	/* if the connected sink is not HDMI capable fall back to plain DVI */
> +	hdmi->dvi = !drm_detect_hdmi_monitor((struct edid *)output->edid);

Shouldn't we update drm_detect_hdmi_monitor() to take a const struct
edid * instead so that this cast isn't required?

Thierry

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] drm: tegra: check HDMI sink capability

[Mark Zhang]

Thanks. Honestly don't know drm has this function...

Mark
On 12/18/2012 01:59 AM, Lucas Stach wrote:
> Check if sink is HDMI capable when enabling an output. This disables
> HDMI audio/infoframes if we are talking to a plain DVI sink. All things
> except this check are already in place.
> 
> Signed-off-by: Lucas Stach <dev-8ppwABl0HbeELgA04lAiVw@public.gmane.org>
> ---
>  drivers/gpu/drm/tegra/hdmi.c | 3 +++
>  1 Datei geändert, 3 Zeilen hinzugefügt(+)
> 
> diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
> index ab40164..32ea7d4 100644
> --- a/drivers/gpu/drm/tegra/hdmi.c
> +++ b/drivers/gpu/drm/tegra/hdmi.c
> @@ -673,6 +673,9 @@ static int tegra_output_hdmi_enable(struct tegra_output *output)
>  	usleep_range(1000, 2000);
>  	tegra_periph_reset_deassert(hdmi->clk);
>  
> +	/* if the connected sink is not HDMI capable fall back to plain DVI */
> +	hdmi->dvi = !drm_detect_hdmi_monitor((struct edid *)output->edid);
> +
>  	tegra_dc_writel(dc, VSYNC_H_POSITION(1),
>  			DC_DISP_DISP_TIMING_OPTIONS);
>  	tegra_dc_writel(dc, DITHER_CONTROL_DISABLE | BASE_COLOR_SIZE888,
> 

Re: [PATCH] drm: tegra: check HDMI sink capability

[Lucas Stach]

Am Dienstag, den 18.12.2012, 07:50 +0100 schrieb Thierry Reding:
> On Mon, Dec 17, 2012 at 06:59:23PM +0100, Lucas Stach wrote:
> > Check if sink is HDMI capable when enabling an output. This disables
> > HDMI audio/infoframes if we are talking to a plain DVI sink. All things
> > except this check are already in place.
> > 
> > Signed-off-by: Lucas Stach <dev-8ppwABl0HbeELgA04lAiVw@public.gmane.org>
> > ---
> >  drivers/gpu/drm/tegra/hdmi.c | 3 +++
> >  1 Datei geändert, 3 Zeilen hinzugefügt(+)
> > 
> > diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
> > index ab40164..32ea7d4 100644
> > --- a/drivers/gpu/drm/tegra/hdmi.c
> > +++ b/drivers/gpu/drm/tegra/hdmi.c
> > @@ -673,6 +673,9 @@ static int tegra_output_hdmi_enable(struct tegra_output *output)
> >  	usleep_range(1000, 2000);
> >  	tegra_periph_reset_deassert(hdmi->clk);
> >  
> > +	/* if the connected sink is not HDMI capable fall back to plain DVI */
> > +	hdmi->dvi = !drm_detect_hdmi_monitor((struct edid *)output->edid);
> 
> Shouldn't we update drm_detect_hdmi_monitor() to take a const struct
> edid * instead so that this cast isn't required?
> 
Yeah. There are a lot of functions to update to make this work right,
though. But as the next merge window is a fair bit away I'll respin this
with proper constified drm edid functions.

Regards,
Lucas