From: Francisco Jerez <currojerez@riseup.net>
Date: Sun, 18 Jul 2010 15:07:16 +0000 (+0200)
Subject: drm/nouveau: Add another Zotac FX5200 TV-out quirk.
X-Git-Tag: v2.6.36-rc1~540^2~19^2~21
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=20b240059297d1748f6120f432d0db0db9115c32;p=net-next-2.6.git

drm/nouveau: Add another Zotac FX5200 TV-out quirk.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 359506e553a..bb3a284c31e 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/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;
 	}