---

yaml --- r: 205092 b: refs/heads/master c: 20b2400 h: refs/heads/master v: v3
git-mirror · Jul 26, 2010 · 9220921 · 9220921
1 parent 9d3ffaa
commit 9220921
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5afb7758fcf558d6a8cd2546bc18aeedfc6192a
+refs/heads/master: 20b240059297d1748f6120f432d0db0db9115c32
diff --git a/trunk/drivers/gpu/drm/nouveau/nv17_tv.c b/trunk/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -120,9 +120,10 @@ static bool
 get_tv_detect_quirks(struct drm_device *dev, uint32_t *pin_mask)
 {
 	/* Zotac FX5200 */
-	if ((dev->pdev->device == 0x0322) &&
-	    (dev->pdev->subsystem_vendor == 0x19da) &&
-	    (dev->pdev->subsystem_device == 0x2035)) {
+	if (dev->pdev->device == 0x0322 &&
+	    dev->pdev->subsystem_vendor == 0x19da &&
+	    (dev->pdev->subsystem_device == 0x1035 ||
+	     dev->pdev->subsystem_device == 0x2035)) {
 		*pin_mask = 0xc;
 		return false;
 	}