summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2016-05-02 18:53:27 -0400
committerBen Hutchings <ben@decadent.org.uk>2016-06-15 21:28:14 +0100
commit2187b4a87421b8adc45b2ec245bf6de81769d802 (patch)
tree7df7ab77e860d3e7354c6f100ab427a482aa3ec7
parent26265a03012688a828523a7d6d53b49d6c12ab6e (diff)
downloadlinux-stable-2187b4a87421b8adc45b2ec245bf6de81769d802.tar.gz
linux-stable-2187b4a87421b8adc45b2ec245bf6de81769d802.tar.bz2
linux-stable-2187b4a87421b8adc45b2ec245bf6de81769d802.zip
drm/radeon: make sure vertical front porch is at least 1
commit 3104b8128d4d646a574ed9d5b17c7d10752cd70b upstream. hw doesn't like a 0 value. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/gpu/drm/radeon/atombios_encoders.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c
index a1a7d071eb17..cd8b34146146 100644
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -90,6 +90,10 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder,
&& (mode->crtc_vsync_start < (mode->crtc_vdisplay + 2)))
adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2;
+ /* vertical FP must be at least 1 */
+ if (mode->crtc_vsync_start == mode->crtc_vdisplay)
+ adjusted_mode->crtc_vsync_start++;
+
/* get the native mode for LVDS */
if (radeon_encoder->active_device & (ATOM_DEVICE_LCD_SUPPORT))
radeon_panel_mode_fixup(encoder, adjusted_mode);