From ee59b0c6b1e57042fafc51b792dbc2823a71bb66 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 24 Apr 2012 13:26:51 +1000 Subject: [PATCH] --- yaml --- r: 300007 b: refs/heads/master c: 0ed4bb92f5514bd1118c5dd537ce424381110286 h: refs/heads/master i: 300005: dbbcc69ce419be5a392b9b5fbef85ac8e28bb518 300003: 6e1118f037a88d16e6c38a8d6f87972a4ad4bc2f 299999: f3ec19a439550a77c0ac895c6c7817ad3056ab97 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_hdmi.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 82eee073ad88..b43d1e000fc9 100644 --- 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 index 59ea1c14eca0..c3de36384522 100644 --- 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; }