From: Daniel Vetter Date: Tue, 3 Nov 2009 09:03:34 +0000 (+0000) Subject: drm/i915: fix get_core_clock_speed for G33 class desktop chips X-Git-Tag: v2.6.33-rc1~323^2~5^2~42 X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=43bcd61fae05fc6062b4f117c5adb1a72c9f8c57;p=net-next-2.6.git 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 Signed-off-by: Eric Anholt --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 43af081328f..33113c7d4e4 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) } /* Returns the core display clock speed */ - if (IS_I945G(dev)) + if (IS_I945G(dev) || (IS_G33(dev) && ! IS_IGDGM(dev))) dev_priv->display.get_display_clock_speed = i945_get_display_clock_speed; else if (IS_I915G(dev))