aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-10-19 08:36:44 -0400
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2012-02-10 14:28:37 -0500
commite0e12a9282a879577ba8e35c73ff5d94ae1f50b9 (patch)
treeb01253a447c9d9194c7059632de0e9ad572b9257 /drivers
parentd65b4e98d7ea3038b767b70fe8be959b2913f16d (diff)
viafb: set correct polarity for second adapter
This patch sets the correct polarity for the second adapter when viafb_SAMM_ON is set and viafb_dual_fb is not set. Just one step to make this mode useful. Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/via/hw.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index d5aaca9cfa7e..08c10366f75a 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -1758,13 +1758,13 @@ static void set_display_channel(void)
1758 } 1758 }
1759} 1759}
1760 1760
1761static u8 get_sync(struct fb_info *info) 1761static u8 get_sync(struct fb_var_screeninfo *var)
1762{ 1762{
1763 u8 polarity = 0; 1763 u8 polarity = 0;
1764 1764
1765 if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT)) 1765 if (!(var->sync & FB_SYNC_HOR_HIGH_ACT))
1766 polarity |= VIA_HSYNC_NEGATIVE; 1766 polarity |= VIA_HSYNC_NEGATIVE;
1767 if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT)) 1767 if (!(var->sync & FB_SYNC_VERT_HIGH_ACT))
1768 polarity |= VIA_VSYNC_NEGATIVE; 1768 polarity |= VIA_VSYNC_NEGATIVE;
1769 return polarity; 1769 return polarity;
1770} 1770}
@@ -1976,13 +1976,13 @@ int viafb_setmode(int video_bpp, int video_bpp1)
1976 viafb_DeviceStatus = CRT_Device; 1976 viafb_DeviceStatus = CRT_Device;
1977 } 1977 }
1978 device_on(); 1978 device_on();
1979 if (!viafb_dual_fb) 1979 if (!viafb_SAMM_ON)
1980 via_set_sync_polarity(devices, get_sync(viafbinfo)); 1980 via_set_sync_polarity(devices, get_sync(&viafbinfo->var));
1981 else { 1981 else {
1982 via_set_sync_polarity(viaparinfo->shared->iga1_devices, 1982 via_set_sync_polarity(viaparinfo->shared->iga1_devices,
1983 get_sync(viafbinfo)); 1983 get_sync(&viafbinfo->var));
1984 via_set_sync_polarity(viaparinfo->shared->iga2_devices, 1984 via_set_sync_polarity(viaparinfo->shared->iga2_devices,
1985 get_sync(viafbinfo1)); 1985 get_sync(&var2));
1986 } 1986 }
1987 1987
1988 clock.set_engine_pll_state(VIA_STATE_ON); 1988 clock.set_engine_pll_state(VIA_STATE_ON);