summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-04-24 05:26:51 +0200
committerBen Skeggs <bskeggs@redhat.com>2012-04-30 07:55:39 +0200
commit0ed4bb92f5514bd1118c5dd537ce424381110286 (patch)
treec2c76d14201c80559d0124ed1bab46839fc0b186 /drivers/gpu/drm
parentdrm/nouveau/bios: fix regression on some nv4x board (diff)
downloadlinux-0ed4bb92f5514bd1118c5dd537ce424381110286.tar.xz
linux-0ed4bb92f5514bd1118c5dd537ce424381110286.zip
drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_hdmi.c4
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 59ea1c14eca0..c3de36384522 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)
+ if (dev_priv->chipset < 0xa3 ||
+ dev_priv->chipset == 0xaa ||
+ dev_priv->chipset == 0xac)
return false;
return true;
}