Merge branch 'master' into for-next

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/video/geode/lxfb_ops.c b/drivers/video/geode/lxfb_ops.c
index 0e5d8c7c3eba..bc35a95e59d4 100644
--- a/drivers/video/geode/lxfb_ops.c
+++ b/drivers/video/geode/lxfb_ops.c
@@ -274,7 +274,15 @@ static void lx_graphics_enable(struct fb_info *info)
                 u32 msrlo, msrhi;
 
                 write_fp(par, FP_PT1, 0);
-                write_fp(par, FP_PT2, FP_PT2_SCRC);
+                temp = FP_PT2_SCRC;
+
+                if (info->var.sync & FB_SYNC_HOR_HIGH_ACT)
+                        temp |= FP_PT2_HSP;
+
+                if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
+                        temp |= FP_PT2_VSP;
+
+                write_fp(par, FP_PT2, temp);
                 write_fp(par, FP_DFC, FP_DFC_BC);
 
                 msrlo = MSR_LX_MSR_PADSEL_TFT_SEL_LOW;