summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-07-17 12:43:20 +0100
committerEric Anholt <eric@anholt.net>2010-07-26 12:00:30 -0700
commit0cc4d4300c28d5c3fc73e5ec91bfd4b0c2c744af (patch)
treeccf2e64cd9949b51b2c794ba2fe9c8ab2ff6b223 /drivers
parentfbd41a7e5843be27386c48b3d0816e93e7865d5d (diff)
downloadlinux-3.10-0cc4d4300c28d5c3fc73e5ec91bfd4b0c2c744af.tar.gz
linux-3.10-0cc4d4300c28d5c3fc73e5ec91bfd4b0c2c744af.tar.bz2
linux-3.10-0cc4d4300c28d5c3fc73e5ec91bfd4b0c2c744af.zip
drm/i915: Fix panel fitting regression since 734b4157
The crtc mode fixup is run after the encoders adjust the mode to fit on their output, so don't reset the mode! Fixes: Bug 29057 - display corruption under 800x600 on netbook (1024x600) with 'Full Aspect' scaling https://bugs.freedesktop.org/show_bug.cgi?id=29057 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Tested-by: Xun Fang <xunx.fang@intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 30d8dafb388..dbd9f09465f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2371,8 +2371,6 @@ static bool intel_crtc_mode_fixup(struct drm_crtc *crtc,
if (mode->clock * 3 > 27000 * 4)
return MODE_CLOCK_HIGH;
}
-
- drm_mode_set_crtcinfo(adjusted_mode, 0);
return true;
}