From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 15 Jan 2013 17:55:07 +0000 (-0800)
Subject: 3.7-stable patches
X-Git-Tag: v3.7.3~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a86946d177e9da79f0992f3feb04997c59a32c7e;p=thirdparty%2Fkernel%2Fstable-queue.git

3.7-stable patches

added patches:
	revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
---

diff --git a/queue-3.7/revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch b/queue-3.7/revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
new file mode 100644
index 00000000000..df22325f008
--- /dev/null
+++ b/queue-3.7/revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch
@@ -0,0 +1,43 @@
+From 48e858340dae43189a4e55647f6eac736766f828 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Mon, 7 Jan 2013 10:27:13 +0100
+Subject: Revert "drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13"
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 48e858340dae43189a4e55647f6eac736766f828 upstream.
+
+This reverts commit 9756fe38d10b2bf90c81dc4d2f17d5632e135364.
+
+The bogus lvds output is actually a lvds->hdmi bridge, which we don't
+really support. But unconditionally disabling it breaks some existing
+setups.
+
+Reported-by: John Tapsell <johnflux@gmail.com>
+References: http://permalink.gmane.org/gmane.comp.freedesktop.xorg.drivers.intel/17237
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Cc: Luis Henriques <luis.henriques@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/gpu/drm/i915/intel_lvds.c |    8 --------
+ 1 file changed, 8 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -763,14 +763,6 @@ static const struct dmi_system_id intel_
+ 	},
+ 	{
+ 		.callback = intel_no_lvds_dmi_callback,
+-		.ident = "ZOTAC ZBOXSD-ID12/ID13",
+-		.matches = {
+-			DMI_MATCH(DMI_BOARD_VENDOR, "ZOTAC"),
+-			DMI_MATCH(DMI_BOARD_NAME, "ZBOXSD-ID12/ID13"),
+-		},
+-	},
+-	{
+-		.callback = intel_no_lvds_dmi_callback,
+ 		.ident = "Gigabyte GA-D525TUD",
+ 		.matches = {
+ 			DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
diff --git a/queue-3.7/series b/queue-3.7/series
index b750f8f06fc..3e99311f93e 100644
--- a/queue-3.7/series
+++ b/queue-3.7/series
@@ -196,3 +196,4 @@ kvm-ppc-44x-fix-dcr-read-write.patch
 0007-libceph-move-linger-requests-sooner-in-kick_requests.patch
 0008-libceph-always-reset-osds-when-kicking.patch
 0009-libceph-WARN-don-t-BUG-on-unexpected-connection-stat.patch
+revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch