From: Francisco Jerez <currojerez@riseup.net>
Date: Sat, 14 Aug 2010 16:45:58 +0000 (+0200)
Subject: drm/nouveau: Add TV-out quirk for an MSI nForce2 IGP.
X-Git-Tag: v2.6.36-rc3~46^2^2~3
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=19bf5f7df918f86a1507389101b5eddcad983951;p=net-next-2.6.git

drm/nouveau: Add TV-out quirk for an MSI nForce2 IGP.

The blob also thinks there's a TV connected, so hardware bug...

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 44fefb0c708..eefa5c85693 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -129,6 +129,14 @@ get_tv_detect_quirks(struct drm_device *dev, uint32_t *pin_mask)
 		return false;
 	}
 
+	/* MSI nForce2 IGP */
+	if (dev->pdev->device == 0x01f0 &&
+	    dev->pdev->subsystem_vendor == 0x1462 &&
+	    dev->pdev->subsystem_device == 0x5710) {
+		*pin_mask = 0xc;
+		return false;
+	}
+
 	return true;
 }