---

yaml --- r: 209822 b: refs/heads/master c: 19bf5f7 h: refs/heads/master v: v3
git-mirror · Aug 17, 2010 · e8b531f · e8b531f
1 parent c5db799
commit e8b531f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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;
 }