From e8b531febc4679ce85f50ad11a8b7001af0b4dae Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Sat, 14 Aug 2010 18:45:58 +0200
Subject: [PATCH] --- yaml --- r: 209822 b: refs/heads/master c:
 19bf5f7df918f86a1507389101b5eddcad983951 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/nouveau/nv17_tv.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bab4a0a8e7c6..24ad3787a3e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46d4cae20038bcb2511cba0c86f0be2d11520369
+refs/heads/master: 19bf5f7df918f86a1507389101b5eddcad983951
diff --git a/trunk/drivers/gpu/drm/nouveau/nv17_tv.c b/trunk/drivers/gpu/drm/nouveau/nv17_tv.c
index 44fefb0c7083..eefa5c856932 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/trunk/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;
 }