From patchwork Fri Sep 11 12:39:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 46845 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 n8BCddaV014039 for ; Fri, 11 Sep 2009 12:39:39 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 751E19ECE7; Fri, 11 Sep 2009 05:39:39 -0700 (PDT) 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 7FD619ECE7 for ; Fri, 11 Sep 2009 05:39:37 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id A9AD220C29D; Fri, 11 Sep 2009 22:33:39 +0200 (CEST) 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-+--HCc:D*org, 0.000-+--H*Ad:D*sourceforge.net, 0.000-+--H*Ad:D*lists.sourceforge.net 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.968-+--H*Ad:U*daniel.vetter, 0.968-+--H*m:ffwll, 0.948-+--H*Ad:D*ffwll.ch Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id AC6C020C292; Fri, 11 Sep 2009 22:33:15 +0200 (CEST) Received: from daniel by biene with local (Exim 4.69) (envelope-from ) id 1Mm5PM-0001Vx-1o; Fri, 11 Sep 2009 14:39:20 +0200 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Fri, 11 Sep 2009 14:39:12 +0200 Message-Id: X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <5ee06b296b3fdd0efb66ef23e5ed2f44ccf06ec3.1252660839.git.daniel.vetter@ffwll.ch> References: <5ee06b296b3fdd0efb66ef23e5ed2f44ccf06ec3.1252660839.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: dri-devel@lists.sourceforge.net, Daniel Vetter Subject: [Intel-gfx] [PATCH 4/5] [drm/i915]: kill superflous IS_I855 macro 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 It is identical to I85X. Use that one instead. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/intel_display.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 4dfc9d1..2573ee0 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -845,7 +845,6 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define IS_I830(dev) ((dev)->pci_device == 0x3577) #define IS_845G(dev) ((dev)->pci_device == 0x2562) #define IS_I85X(dev) ((dev)->pci_device == 0x3582) -#define IS_I855(dev) ((dev)->pci_device == 0x3582) #define IS_I865G(dev) ((dev)->pci_device == 0x2572) #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index d0a74e5..b85a6cc 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1741,7 +1741,7 @@ static int intel_get_core_clock_speed(struct drm_device *dev) } } else if (IS_I865G(dev)) return 266000; - else if (IS_I855(dev)) { + else if (IS_I85X(dev)) { u16 hpllcc = 0; /* Assume that the hardware is in the high speed state. This * should be the default. @@ -3902,7 +3902,7 @@ void intel_init_clock_gating(struct drm_device *dev) dstate |= DSTATE_PLL_D3_OFF | DSTATE_GFX_CLOCK_GATING | DSTATE_DOT_CLOCK_GATING; I915_WRITE(D_STATE, dstate); - } else if (IS_I855(dev) || IS_I865G(dev)) { + } else if (IS_I85X(dev) || IS_I865G(dev)) { I915_WRITE(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE); } else if (IS_I830(dev)) { I915_WRITE(DSPCLK_GATE_D, OVRUNIT_CLOCK_GATE_DISABLE);