aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2009-11-03 04:03:34 -0500
committerEric Anholt <eric@anholt.net>2009-11-05 17:57:39 -0500
commit43bcd61fae05fc6062b4f117c5adb1a72c9f8c57 (patch)
treefec57283d61b5e6f7a4a93e3c12fd4ea888222c9 /drivers/gpu/drm/i915
parentc650156af34bffa3d3a62c9fe26eee595aab3fd1 (diff)
drm/i915: fix get_core_clock_speed for G33 class desktop chips
Somehow the case for G33 got dropped while porting from ums code. This made a 400MHz chip into a 133MHz one which resulted in the unnecessary enabling of double wide pipe mode which in turn screwed up the overlay code. Nothing else (than the overlay code) seems to be affected. This fixes fdo.org bug #24835 Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 43af081328fe..33113c7d4e49 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4427,7 +4427,7 @@ static void intel_init_display(struct drm_device *dev)
4427 } 4427 }
4428 4428
4429 /* Returns the core display clock speed */ 4429 /* Returns the core display clock speed */
4430 if (IS_I945G(dev)) 4430 if (IS_I945G(dev) || (IS_G33(dev) && ! IS_IGDGM(dev)))
4431 dev_priv->display.get_display_clock_speed = 4431 dev_priv->display.get_display_clock_speed =
4432 i945_get_display_clock_speed; 4432 i945_get_display_clock_speed;
4433 else if (IS_I915G(dev)) 4433 else if (IS_I915G(dev))