]>
Commit | Line | Data |
---|---|---|
40ebb566 GKH |
1 | From 0a90a0cff9f429f886f423967ae053150dce9259 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Deucher <alexander.deucher@amd.com> | |
3 | Date: Mon, 27 Jul 2015 19:24:31 -0400 | |
4 | Subject: drm/radeon/combios: add some validation of lvds values | |
5 | ||
6 | From: Alex Deucher <alexander.deucher@amd.com> | |
7 | ||
8 | commit 0a90a0cff9f429f886f423967ae053150dce9259 upstream. | |
9 | ||
10 | Fixes a broken hsync start value uncovered by: | |
11 | abc0b1447d4974963548777a5ba4a4457c82c426 | |
12 | (drm: Perform basic sanity checks on probed modes) | |
13 | ||
14 | The driver handled the bad hsync start elsewhere, but | |
15 | the above commit prevented it from getting added. | |
16 | ||
17 | bug: | |
18 | https://bugs.freedesktop.org/show_bug.cgi?id=91401 | |
19 | ||
20 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | ||
23 | --- | |
24 | drivers/gpu/drm/radeon/radeon_combios.c | 7 ++++++- | |
25 | 1 file changed, 6 insertions(+), 1 deletion(-) | |
26 | ||
27 | --- a/drivers/gpu/drm/radeon/radeon_combios.c | |
28 | +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |
29 | @@ -1271,10 +1271,15 @@ struct radeon_encoder_lvds *radeon_combi | |
30 | ||
31 | if ((RBIOS16(tmp) == lvds->native_mode.hdisplay) && | |
32 | (RBIOS16(tmp + 2) == lvds->native_mode.vdisplay)) { | |
33 | + u32 hss = (RBIOS16(tmp + 21) - RBIOS16(tmp + 19) - 1) * 8; | |
34 | + | |
35 | + if (hss > lvds->native_mode.hdisplay) | |
36 | + hss = (10 - 1) * 8; | |
37 | + | |
38 | lvds->native_mode.htotal = lvds->native_mode.hdisplay + | |
39 | (RBIOS16(tmp + 17) - RBIOS16(tmp + 19)) * 8; | |
40 | lvds->native_mode.hsync_start = lvds->native_mode.hdisplay + | |
41 | - (RBIOS16(tmp + 21) - RBIOS16(tmp + 19) - 1) * 8; | |
42 | + hss; | |
43 | lvds->native_mode.hsync_end = lvds->native_mode.hsync_start + | |
44 | (RBIOS8(tmp + 23) * 8); | |
45 |