[PATCH] drm/nouveau/hdmi: Fix chipset check for HDMI sound

[PATCH] drm/nouveau/hdmi: Fix chipset check for HDMI sound

[Alexander Stein]

NVIDIA Corporation C77 [GeForce 8300] (rev a2) has chipset 0xaa which
supports HDMI Audio.

Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
---
 drivers/gpu/drm/nouveau/nouveau_hdmi.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/drivers/gpu/drm/nouveau/nouveau_hdmi.c
index 59ea1c1..2feafaa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hdmi.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hdmi.c
@@ -32,7 +32,9 @@ static bool
 hdmi_sor(struct drm_encoder *encoder)
 {
 	struct drm_nouveau_private *dev_priv = encoder->dev->dev_private;
-	if (dev_priv->chipset < 0xa3)
+	int chipset = dev_priv->chipset;
+
+	if (chipset < 0xa3 || chipset == 0xaa || chipset == 0xa)
 		return false;
 	return true;
 }
-- 
1.7.8.6

Re: [PATCH] drm/nouveau/hdmi: Fix chipset check for HDMI sound

[Ben Skeggs]

On Sun, 2012-04-29 at 20:12 +0200, Alexander Stein wrote:
> NVIDIA Corporation C77 [GeForce 8300] (rev a2) has chipset 0xaa which
> supports HDMI Audio.
This was fixed in nouveau git already a few days ago:

http://cgit.freedesktop.org/nouveau/linux-2.6/commit/?id=2c421e3ad2672e1253abca6387ccbb10cf422717

Cheers,
Ben.

> 
> Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
> ---
>  drivers/gpu/drm/nouveau/nouveau_hdmi.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/drivers/gpu/drm/nouveau/nouveau_hdmi.c
> index 59ea1c1..2feafaa 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_hdmi.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_hdmi.c
> @@ -32,7 +32,9 @@ static bool
>  hdmi_sor(struct drm_encoder *encoder)
>  {
>  	struct drm_nouveau_private *dev_priv = encoder->dev->dev_private;
> -	if (dev_priv->chipset < 0xa3)
> +	int chipset = dev_priv->chipset;
> +
> +	if (chipset < 0xa3 || chipset == 0xaa || chipset == 0xa)
>  		return false;
>  	return true;
>  }