From: Greg Kroah-Hartman Date: Tue, 15 Jan 2013 17:54:47 +0000 (-0800) Subject: 3.4-stable patches X-Git-Tag: v3.7.3~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac8f24f96a7c108b0d60709f55c96d0323323015;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch --- diff --git a/queue-3.4/0014-drm-Add-EDID_QUIRK_FORCE_REDUCED_BLANKING-for-ASUS-V.patch b/queue-3.4/0014-drm-Add-EDID_QUIRK_FORCE_REDUCED_BLANKING-for-ASUS-V.patch deleted file mode 100644 index a287cb6ae1b..00000000000 --- a/queue-3.4/0014-drm-Add-EDID_QUIRK_FORCE_REDUCED_BLANKING-for-ASUS-V.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 31d04b5fa45264da10750fc7f526d0e65f894a29 Mon Sep 17 00:00:00 2001 -From: Paul Menzel -Date: Wed, 8 Aug 2012 23:12:19 +0200 -Subject: drm: Add EDID_QUIRK_FORCE_REDUCED_BLANKING for ASUS VW222S - -From: Paul Menzel - -commit 6f33814bd4d9cfe76033a31b1c0c76c960cd8e4b upstream. - -Connecting an ASUS VW222S [1] over VGA a garbled screen is shown with -vertical stripes in the top half. - -In commit bc42aabc [2] - - commit bc42aabc6a01b92b0f961d65671564e0e1cd7592 - Author: Adam Jackson - Date: Wed May 23 16:26:54 2012 -0400 - - drm/edid/quirks: ViewSonic VA2026w - -Adam Jackson added the quirk `EDID_QUIRK_FORCE_REDUCED_BLANKING` which -is also needed for this ASUS monitor. - -All log files and output from `xrandr` is included in the referenced -Bugzilla report #17629. - -Please note that this monitor only has a VGA (D-Sub) connector [1]. - -[1] http://www.asus.com/Display/LCD_Monitors/VW222S/ -[2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=bc42aabc6a01b92b0f961d65671564e0e1cd7592 - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=17629 -Signed-off-by: Paul Menzel -Cc: -Cc: Adam Jackson -Cc: Ian Pilcher -Signed-off-by: Dave Airlie -Signed-off-by: Julien Cristau -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/drm_edid.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/gpu/drm/drm_edid.c -+++ b/drivers/gpu/drm/drm_edid.c -@@ -87,6 +87,9 @@ static struct edid_quirk { - int product_id; - u32 quirks; - } edid_quirk_list[] = { -+ /* ASUS VW222S */ -+ { "ACI", 0x22a2, EDID_QUIRK_FORCE_REDUCED_BLANKING }, -+ - /* Acer AL1706 */ - { "ACR", 44358, EDID_QUIRK_PREFER_LARGE_60 }, - /* Acer F51 */ diff --git a/queue-3.4/revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch b/queue-3.4/revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch new file mode 100644 index 00000000000..5ae4d953ed1 --- /dev/null +++ b/queue-3.4/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 +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 + +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 +References: http://permalink.gmane.org/gmane.comp.freedesktop.xorg.drivers.intel/17237 +Signed-off-by: Daniel Vetter +Cc: Luis Henriques +Signed-off-by: Greg Kroah-Hartman + + +--- + 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 +@@ -779,14 +779,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.4/series b/queue-3.4/series index 27d8a9bc57f..a29f832d981 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -122,10 +122,10 @@ kvm-ppc-44x-fix-dcr-read-write.patch 0011-drm-i915-add-some-barriers-when-changing-DIPs.patch 0012-drm-i915-SDVO-hotplug-have-different-interrupt-statu.patch 0013-drm-radeon-fix-ordering-in-pll-picking-on-dce4.patch -0014-drm-Add-EDID_QUIRK_FORCE_REDUCED_BLANKING-for-ASUS-V.patch 0015-drm-i915-only-enable-sdvo-hotplug-irq-if-needed.patch 0016-drm-i915-Reduce-a-pin-leak-BUG-into-a-WARN.patch 0017-drm-i915-prevent-possible-pin-leak-on-error-path.patch 0018-drm-i915-Fix-GT_MODE-default-value.patch 0019-drm-i915-call-drm_handle_vblank-before-finish_page_f.patch 0020-drm-i915-Flush-the-pending-flips-on-the-CRTC-before-.patch +revert-drm-i915-no-lvds-quirk-for-zotac-zdbox-sd-id12-id13.patch