From patchwork Wed Jan 12 20:27:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Torvalds X-Patchwork-Id: 474861 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 p0CKS3NV029053 for ; Wed, 12 Jan 2011 20:28:30 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14AF59EF09 for ; Wed, 12 Jan 2011 12:28:03 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by gabe.freedesktop.org (Postfix) with ESMTP id 64A4C9EEBC for ; Wed, 12 Jan 2011 12:27:51 -0800 (PST) Received: from mail-iy0-f177.google.com (mail-iy0-f177.google.com [209.85.210.177]) (authenticated bits=0) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p0CKRoPS025724 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=FAIL) for ; Wed, 12 Jan 2011 12:27:50 -0800 Received: by iyj21 with SMTP id 21so893962iyj.36 for ; Wed, 12 Jan 2011 12:27:50 -0800 (PST) Received: by 10.231.34.195 with SMTP id m3mr1526649ibd.116.1294864070193; Wed, 12 Jan 2011 12:27:50 -0800 (PST) MIME-Version: 1.0 Received: by 10.231.31.72 with HTTP; Wed, 12 Jan 2011 12:27:30 -0800 (PST) In-Reply-To: <20110112114649.5365d518@jbarnes-desktop> References: <20110112114649.5365d518@jbarnes-desktop> From: Linus Torvalds Date: Wed, 12 Jan 2011 12:27:30 -0800 Message-ID: Subject: Re: [git pull] drm intel only fixes To: Jesse Barnes X-Spam-Status: No, hits=-3.478 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Cc: linux-kernel@vger.kernel.org, DRI mailing list X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 12 Jan 2011 20:28:30 +0000 (UTC) drivers/gpu/drm/i915/intel_display.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 25d9688..2ea1a51 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3445,6 +3445,7 @@ static bool ironlake_compute_wm0(struct drm_device *dev, entries += tlb_miss; entries = DIV_ROUND_UP(entries, display->cacheline_size); *plane_wm = entries + display->guard_size; +*plane_wm *=2; if (*plane_wm > (int)display->max_wm) *plane_wm = display->max_wm; @@ -3457,6 +3458,7 @@ static bool ironlake_compute_wm0(struct drm_device *dev, entries += tlb_miss; entries = DIV_ROUND_UP(entries, cursor->cacheline_size); *cursor_wm = entries + cursor->guard_size; +*cursor_wm *= 2; if (*cursor_wm > (int)cursor->max_wm) *cursor_wm = (int)cursor->max_wm; @@ -3607,6 +3609,8 @@ static void ironlake_update_wm(struct drm_device *dev, if (enabled != 1) return; +return; + clock = planea_clock ? planea_clock : planeb_clock; /* WM1 */