From 4ce8679c17cbe0b7248ac445a49a9a7b40bbfec9 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 15 Jul 2010 11:25:55 +1000
Subject: [PATCH] --- yaml --- r: 205087 b: refs/heads/master c:
 03639b50385810c2153624c0c8cb85de93d31356 h: refs/heads/master i:   205085:
 9ce1c4479fae9db1cbc463d6f788d67e6e216e6e   205083:
 014d90bacc18f3b840c8c6cafd3ea94df58de8fa   205079:
 d37c90622634c7403fae8318f0656f02e983e4cc   205071:
 cf900268863b2d9d9715800670e8455ce8901e7b   205055:
 2780ae2201aaceda77b3215ecf2363a7bd91706f v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 288016867dce..0ae8c0e912e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 734ee8357ac2685a306acd598826d5eb8a3fca30
+refs/heads/master: 03639b50385810c2153624c0c8cb85de93d31356
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
index 5437c896e10a..2297bbc88c6f 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -5739,13 +5739,6 @@ parse_dcb15_entry(struct drm_device *dev, struct dcb_table *dcb,
 	case OUTPUT_TV:
 		entry->tvconf.has_component_output = false;
 		break;
-	case OUTPUT_TMDS:
-		/*
-		 * Invent a DVI-A output, by copying the fields of the DVI-D
-		 * output; reported to work by math_b on an NV20(!).
-		 */
-		fabricate_vga_output(dcb, entry->i2c_index, entry->heads);
-		break;
 	case OUTPUT_LVDS:
 		if ((conn & 0x00003f00) != 0x10)
 			entry->lvdsconf.use_straps_for_mode = true;