From f79f3847bb17ac732c7722bb1a3e9b4695eecfd9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 4 Dec 2009 11:51:34 +1000
Subject: [PATCH] --- yaml --- r: 174621 b: refs/heads/master c:
 aa1a750ecb3412f69fe34081b249aa978154f360 h: refs/heads/master i:   174619:
 dab4127bda0eafe6f097f2093b42c1edf4213825 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_atombios.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3ab78deba40f..c19f14d46c06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0088dbdb809e8799cb8f26da5ac64b15201fa99d
+refs/heads/master: aa1a750ecb3412f69fe34081b249aa978154f360
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_atombios.c b/trunk/drivers/gpu/drm/radeon/radeon_atombios.c
index 0802b30879d9..5e414102c875 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -143,6 +143,15 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
 			return false;
 	}
 
+	/* Gigabyte X1300 is DVI+VGA, not DVI+DVI */
+	if ((dev->pdev->device == 0x7142) &&
+	    (dev->pdev->subsystem_vendor == 0x1458) &&
+	    (dev->pdev->subsystem_device == 0x2134)) {
+		if (supported_device == ATOM_DEVICE_DFP1_SUPPORT)
+			return false;
+	}
+
+
 	/* Funky macbooks */
 	if ((dev->pdev->device == 0x71C5) &&
 	    (dev->pdev->subsystem_vendor == 0x106b) &&