From patchwork Fri Sep 25 08:01:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 50113 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 n8P81oAb015835 for ; Fri, 25 Sep 2009 08:01:50 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 164819F6BA; Fri, 25 Sep 2009 01:01:49 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id ABB919E7F1 for ; Fri, 25 Sep 2009 01:01:46 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 25 Sep 2009 00:46:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,450,1249282800"; d="scan'208";a="553673423" Received: from debian-hpilk.sh.intel.com (HELO localhost.localdomain) ([10.239.36.76]) by orsmga001.jf.intel.com with ESMTP; 25 Sep 2009 01:00:57 -0700 From: Zhenyu Wang To: eric@anholt.net Date: Fri, 25 Sep 2009 16:01:29 +0800 Message-Id: <1253865689-4847-2-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.6.4.3 In-Reply-To: <1253865689-4847-1-git-send-email-zhenyuw@linux.intel.com> References: <1253865689-4847-1-git-send-email-zhenyuw@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 2/2] drm/i915: disable powersave feature for Ironlake currently 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 Until we figure out the right setting for powersave features on Ironlake, disable it for now, also disable watermark update, which has new registers for it on Ironlake too. Signed-off-by: Zhenyu Wang --- drivers/gpu/drm/i915/i915_dma.c | 3 +++ drivers/gpu/drm/i915/intel_display.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 45d507e..733f051 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1202,6 +1202,9 @@ static int i915_load_modeset_init(struct drm_device *dev, if (IS_I965G(dev) || IS_G33(dev)) dev_priv->cursor_needs_physical = false; + if (IS_IGDNG(dev)) + i915_powersave = 0; + /* Basic memrange allocator for stolen space (aka vram) */ drm_mm_init(&dev_priv->vram, 0, prealloc_size); DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024)); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 10c42e5..af8189f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2587,6 +2587,9 @@ static void intel_update_watermarks(struct drm_device *dev) unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0; int enabled = 0, pixel_size = 0; + if (IS_IGDNG(dev)) + return; + /* Get the clock config from both planes */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { intel_crtc = to_intel_crtc(crtc);