Re: Linux 2.6.33-rc4

[Jesse Barnes <jbarnes@virtuousgeek.org>]

On Wed, 13 Jan 2010 23:03:00 +0200
Pekka Enberg <penberg@cs.helsinki.fi> wrote:

> On Wed, Jan 13, 2010 at 7:44 AM, Linus Torvalds
> <torvalds@linux-foundation.org> 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;
 
 	/*