Patchwork [Natty,SRU] drm/i915: fix CB tuning check for ILK+

login
register
mail settings
Submitter TImo Aaltonen
Date Nov. 16, 2011, 9:45 a.m.
Message ID <4EC38642.9070706@ubuntu.com>
Download mbox | patch
Permalink /patch/125971/
State New
Headers show

Comments

TImo Aaltonen - Nov. 16, 2011, 9:45 a.m.
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/891031

This patch fixes panel corruption on my T420s which occurs after
plugging an external monitor to the vga port. Originally from 3.1,
applies to 3.0 too but I'll post this upstream to include in the stable
series.

upstream commit cb0e093162d7b6589c2217a00e2abfef686b32d6

Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Stefan Bader - Nov. 16, 2011, 11:58 a.m.
On 16.11.2011 10:45, TImo Aaltonen wrote:
> 
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/891031
> 
> This patch fixes panel corruption on my T420s which occurs after
> plugging an external monitor to the vga port. Originally from 3.1,
> applies to 3.0 too but I'll post this upstream to include in the stable
> series.
> 
> upstream commit cb0e093162d7b6589c2217a00e2abfef686b32d6
> 
> Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
> 
> 
> 
Looks like those so simple looking changes that are looking so simple but may
mean anything. It come with 3.1 and is a cherry-pick. So tend to agree...
Maybe want to wait/sync with the time this goes into 3.0.y (though I can see
this then needing a reminder).
Tim Gardner - Nov. 16, 2011, 12:12 p.m.
On 11/16/2011 04:45 AM, TImo Aaltonen wrote:
>
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/891031
>
> This patch fixes panel corruption on my T420s which occurs after
> plugging an external monitor to the vga port. Originally from 3.1,
> applies to 3.0 too but I'll post this upstream to include in the stable
> series.
>
> upstream commit cb0e093162d7b6589c2217a00e2abfef686b32d6
>
> Signed-off-by: Timo Aaltonen<timo.aaltonen@canonical.com>
>
>
>

Needs SRU justification in LP report
TImo Aaltonen - Nov. 17, 2011, 7:35 a.m.
16.11.2011 13:58, Stefan Bader kirjoitti:
> On 16.11.2011 10:45, TImo Aaltonen wrote:
>>
>> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/891031
>>
>> This patch fixes panel corruption on my T420s which occurs after
>> plugging an external monitor to the vga port. Originally from 3.1,
>> applies to 3.0 too but I'll post this upstream to include in the stable
>> series.
>>
>> upstream commit cb0e093162d7b6589c2217a00e2abfef686b32d6
>>
>> Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
>>
>>
>>
> Looks like those so simple looking changes that are looking so simple but may
> mean anything. It come with 3.1 and is a cherry-pick. So tend to agree...
> Maybe want to wait/sync with the time this goes into 3.0.y (though I can see
> this then needing a reminder).

I asked the author, and there should be "very little regression
potential". Sent it to the stable queue too, haven't heard back yet.
Tim Gardner - Nov. 17, 2011, 11:43 a.m.
On 11/16/2011 04:45 AM, TImo Aaltonen wrote:
>
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/891031
>
> This patch fixes panel corruption on my T420s which occurs after
> plugging an external monitor to the vga port. Originally from 3.1,
> applies to 3.0 too but I'll post this upstream to include in the stable
> series.
>
> upstream commit cb0e093162d7b6589c2217a00e2abfef686b32d6
>
> Signed-off-by: Timo Aaltonen<timo.aaltonen@canonical.com>
>
>
>

Patch

From cb0e093162d7b6589c2217a00e2abfef686b32d6 Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu, 28 Jul 2011 14:50:30 -0700
Subject: [PATCH] drm/i915: fix CB tuning check for ILK+

CB tuning is needed to handle potential process variations that might
cause clock jitter for certain PLL settings.  However, we were setting
it incorrectly since we were using the wrong M value as a check (M1 when
we needed to use the whole M value).  Fix it up, making my HDMI
attached display a little prettier (used to have occasional dots crawl
across the display).

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8f7ed73..32c8c95 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4994,7 +4994,7 @@  static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
 	} else if (is_sdvo && is_tv)
 		factor = 20;
 
-	if (clock.m1 < factor * clock.n)
+	if (clock.m < factor * clock.n)
 		fp |= FP_CB_TUNE;
 
 	dpll = 0;
-- 
1.7.5.4