From patchwork Sat Dec 25 04:29:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 432521 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBP4U8ZO015786 for ; Sat, 25 Dec 2010 04:30:33 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 846AA9EBA4 for ; Fri, 24 Dec 2010 20:30:07 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from cpoproxy2-pub.bluehost.com (cpoproxy2-pub.bluehost.com [67.222.39.38]) by gabe.freedesktop.org (Postfix) with SMTP id DF4F59E747 for ; Fri, 24 Dec 2010 20:29:38 -0800 (PST) Received: (qmail 18538 invoked by uid 0); 25 Dec 2010 04:29:38 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy2.bluehost.com with SMTP; 25 Dec 2010 04:29:38 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:X-Identified-User; b=RD6j6jXizHXGaQ6c7w6UMpd6tJwFV0i0wVAFtpC5PLHbb7sAQDjwqGtzHRnTh/MvRwxbZE8yqIwKT2QzBqKk2P3AAOZrvHuWBonmfcmOdyN99dA8DbQc7PvU0IXWlfTp; Received: from c-67-174-193-198.hsd1.ca.comcast.net ([67.174.193.198] helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1PWLlB-0001CS-D3; Fri, 24 Dec 2010 21:29:37 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 24 Dec 2010 20:29:34 -0800 Message-Id: <1293251374-2565-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.2.3 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.174.193.198 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH] drm/i915: disable rc6 on Cantiga and Crestline X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 25 Dec 2010 04:30:33 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3f73690..3a488ef 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6702,12 +6702,7 @@ void intel_modeset_init(struct drm_device *dev) if (IS_IRONLAKE_M(dev)) { ironlake_enable_drps(dev); intel_init_emon(dev); - } - - if (IS_GEN6(dev)) - gen6_enable_rps(dev_priv); - if ((IS_GEN4(dev) || IS_GEN5(dev)) && IS_MOBILE(dev)) { dev_priv->renderctx = intel_alloc_context_page(dev); if (!dev_priv->renderctx) goto skip_rc6; @@ -6720,6 +6715,9 @@ void intel_modeset_init(struct drm_device *dev) ironlake_enable_rc6(dev); } + if (IS_GEN6(dev)) + gen6_enable_rps(dev_priv); + skip_rc6: INIT_WORK(&dev_priv->idle_work, intel_idle_update); setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer, @@ -6752,14 +6750,13 @@ void intel_modeset_cleanup(struct drm_device *dev) if (dev_priv->display.disable_fbc) dev_priv->display.disable_fbc(dev); - if (IS_IRONLAKE_M(dev)) + if (IS_IRONLAKE_M(dev)) { ironlake_disable_drps(dev); + ironlake_disable_rc6(dev); + } if (IS_GEN6(dev)) gen6_disable_rps(dev); - if ((IS_GEN4(dev) || IS_GEN5(dev)) && IS_MOBILE(dev)) - ironlake_disable_rc6(dev); - mutex_unlock(&dev->struct_mutex); /* Disable the irq before mode object teardown, for the irq might