Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755527Ab0AMVeB (ORCPT ); Wed, 13 Jan 2010 16:34:01 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752707Ab0AMVeA (ORCPT ); Wed, 13 Jan 2010 16:34:00 -0500 Received: from outbound-mail-303.bluehost.com ([67.222.53.10]:53304 "HELO outbound-mail-303.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751911Ab0AMVd7 (ORCPT ); Wed, 13 Jan 2010 16:33:59 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=ZnAN2y2C/p9CLhO6PkttOKK6Dgnxx4MRb75kBN+s0WKT6/YN3ADDQBuKNBk72ItsDBaLW12LWsxnYWnzqey+KN5kpkO9rf+nfvWU0u7RCFC0zeBZg+DlrnWwHJPR/Xqr; Date: Wed, 13 Jan 2010 13:33:57 -0800 From: Jesse Barnes To: Pekka Enberg Cc: Linus Torvalds , Linux Kernel Mailing List , airlied@linux.ie Subject: Re: Linux 2.6.33-rc4 Message-ID: <20100113133357.67f9df6d@jbarnes-piketon> In-Reply-To: <84144f021001131303u56fa5470ua1c27dfef9f3de81@mail.gmail.com> References: <84144f021001131303u56fa5470ua1c27dfef9f3de81@mail.gmail.com> X-Mailer: Claws Mail 3.7.2 (GTK+ 2.18.3; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 75.111.28.251 authed with jbarnes@virtuousgeek.org} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1688 Lines: 47 On Wed, 13 Jan 2010 23:03:00 +0200 Pekka Enberg wrote: > On Wed, Jan 13, 2010 at 7:44 AM, Linus Torvalds > wrote: > > Hmm. Odd release. Something like 40% of the patches are in DRM > > (mostly nouveau and radeon, both staging, so it's a bit less scary > > than it sounds. But there's a noticeable i915 component too). > > That's all pretty unusual, afaik. > > 2.6.33-rc4 still suffers from an annoying screen flicker with i915 and > KMS on my machine. I *think* it started with 2.6.33-rc1 but I haven't > had the time to dig deeper. Does this patch fix it? If so I'll queue something like this up for -rc5. -- Jesse Barnes, Intel Open Source Technology Center diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9187a17..0ab1bef 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3806,7 +3806,7 @@ static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule) if (IS_IRONLAKE(dev)) return; - if (!dev_priv->lvds_downclock_avail) + if (!dev_priv->lvds_downclock_avail || 1) return; if (!HAS_PIPE_CXSR(dev) && (dpll & DISPLAY_RATE_SELECT_FPA1)) { @@ -3845,7 +3845,7 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc) if (IS_IRONLAKE(dev)) return; - if (!dev_priv->lvds_downclock_avail) + if (!dev_priv->lvds_downclock_avail || 1) return; /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/