]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 30 Dec 2010 09:07:15 +0000 (09:07 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 30 Dec 2010 13:50:12 +0000 (13:50 +0000)
As I feared, whilst this fixed the clocks for the Lenovo U160, it broke
many other machines. So lets reverts commit 448f53a1ede54eb854d036abf
and search for the real bug.

Reported-and-tested-by: Travis Hume <travis@computoring.org> [et al]
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25842
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32698
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_bios.c

index 2b2078695d2acb9c105a56b8256a87a625f428e1..b0b1200ed6500055b05bc1e51a932df26b6600ef 100644 (file)
@@ -270,7 +270,7 @@ parse_general_features(struct drm_i915_private *dev_priv,
                                        general->ssc_freq ? 66 : 48;
                        else if (IS_GEN5(dev) || IS_GEN6(dev))
                                dev_priv->lvds_ssc_freq =
-                                       general->ssc_freq ? 120 : 100;
+                                       general->ssc_freq ? 100 : 120;
                        else
                                dev_priv->lvds_ssc_freq =
                                        general->ssc_freq ? 100 : 96;