linux-omap 2.6.37: replace various patch with upstream versions and rediff
[openembedded.git] / recipes / linux / linux-omap-2.6.37 / linus / 0033-Revert-drm-i915-bios-Reverse-order-of-100-120-Mhz-SS.patch
blobffffd87e1610fbe99c5054302e1b618216cfe422
1 From 5cd3371a75c27fe5b105037b1a9a53b661a3624e Mon Sep 17 00:00:00 2001
2 From: Chris Wilson <chris@chris-wilson.co.uk>
3 Date: Thu, 30 Dec 2010 09:07:15 +0000
4 Subject: [PATCH 33/65] Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
6 As I feared, whilst this fixed the clocks for the Lenovo U160, it broke
7 many other machines. So lets reverts commit 448f53a1ede54eb854d036abf
8 and search for the real bug.
10 Reported-and-tested-by: Travis Hume <travis@computoring.org> [et al]
11 Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25842
12 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32698
13 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
14 ---
15 drivers/gpu/drm/i915/intel_bios.c | 2 +-
16 1 files changed, 1 insertions(+), 1 deletions(-)
18 diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
19 index 2b20786..b0b1200 100644
20 --- a/drivers/gpu/drm/i915/intel_bios.c
21 +++ b/drivers/gpu/drm/i915/intel_bios.c
22 @@ -270,7 +270,7 @@ parse_general_features(struct drm_i915_private *dev_priv,
23 general->ssc_freq ? 66 : 48;
24 else if (IS_GEN5(dev) || IS_GEN6(dev))
25 dev_priv->lvds_ssc_freq =
26 - general->ssc_freq ? 120 : 100;
27 + general->ssc_freq ? 100 : 120;
28 else
29 dev_priv->lvds_ssc_freq =
30 general->ssc_freq ? 100 : 96;
31 --
32 1.6.6.1