From patchwork Thu Nov 17 11:26:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Natty,SRU] drm/i915: fix CB tuning check for ILK+ Date: Thu, 17 Nov 2011 01:26:01 -0000 From: Stefan Bader X-Patchwork-Id: 126188 Message-Id: <4EC4EF49.1050401@canonical.com> To: TImo Aaltonen Cc: kernel-team@lists.ubuntu.com 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 > > > Having the maintainer agreeing is good. So I tried to go forward and get the patch into Natty. But the submitted patch does not apply to Natty. While it can be resolved that looks ok, it makes me a bit suspicious about the having tested part for Natty... Attached is the backport version (also including the signed-off-by block in the style we would like to see in submitted patches (without the acks of course)). Is that what got really tested? -Stefan >From 92e30fe36ce949d2634b40e82d9f5c84baade25f Mon Sep 17 00:00:00 2001 From: Jesse Barnes 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 Signed-off-by: Keith Packard (backported from commit cb0e093162d7b6589c2217a00e2abfef686b32d6 upstream) BugLink: http://bugs.launchpad.net/bugs/891031 Signed-off-by: Timo Aaltonen Acked-by: Stefan Bader Acked-by: Tim Gardner Signed-off-by: Stefan Bader --- 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 dc51881..2c8a234 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4346,7 +4346,7 @@ static int intel_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; } -- 1.7.5.4