---

yaml --- r: 300007 b: refs/heads/master c: 0ed4bb9 h: refs/heads/master i: 300005: dbbcc69 300003: 6e1118f 299999: f3ec19a v: v3
git-mirror · Apr 30, 2012 · ee59b0c · ee59b0c
1 parent 3214370
commit ee59b0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5206b524c9b4e289ab0565e7bffd503d2e671c6e
+refs/heads/master: 0ed4bb92f5514bd1118c5dd537ce424381110286
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/trunk/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;
 }