From patchwork Tue Nov 3 09:03:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 57236 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA393LxS019844 for ; Tue, 3 Nov 2009 09:03:21 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D68AF9EC76; Tue, 3 Nov 2009 01:03:19 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F90F9E794 for ; Tue, 3 Nov 2009 01:03:17 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 191AD20C213; Tue, 3 Nov 2009 10:03:17 +0100 (CET) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--struct, 0.000-+--signedoffby, 0.000-+--signed-off-by X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.987-1--Returns, 0.965-+--H*Ad:U*daniel.vetter, 0.962-+--H*m:ffwll Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id 1988720C123; Tue, 3 Nov 2009 10:03:11 +0100 (CET) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1N5FIf-0002ZX-13; Tue, 03 Nov 2009 10:03:37 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 3 Nov 2009 10:03:34 +0100 Message-Id: <1257239014-9857-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.4.3 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: fix get_core_clock_speed for G33 class desktop chips X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1a40b9a..4d1818d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4296,7 +4296,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))