summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-11-21 16:05:56 +0100
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-11-22 01:56:17 +0100
commita32839696a8eef813a1aff604fbad9a32dff6c95 (patch)
tree7a0569f2301e25e9fbd9fec258fab46bb2adf2f4 /drivers/video
parentMerge branch 'for-3.2-rc' of git://gitorious.org/linux-omap-dss2/linux into f... (diff)
downloadlinux-a32839696a8eef813a1aff604fbad9a32dff6c95.tar.xz
linux-a32839696a8eef813a1aff604fbad9a32dff6c95.zip
viafb: correct sync polarity for OLPC DCON
While the OLPC display appears to be able to handle either positive or negative sync, the Display Controller only recognises positive sync. This brings viafb (for XO-1.5) in line with lxfb (for XO-1) and fixes a recent regression where the XO-1.5 DCON could no longer be frozen. Thanks to Florian Tobias Schandinat for helping identify the fix. Test case: from a vt, echo 1 > /sys/devices/platform/dcon/freeze should cause the current screen contents to freeze, rather than garbage being displayed. Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: stable@kernel.org
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/via/share.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h
index 69d882cbe709..c01c1c162726 100644
--- a/drivers/video/via/share.h
+++ b/drivers/video/via/share.h
@@ -559,8 +559,8 @@
#define M1200X720_R60_VSP POSITIVE
/* 1200x900@60 Sync Polarity (DCON) */
-#define M1200X900_R60_HSP NEGATIVE
-#define M1200X900_R60_VSP NEGATIVE
+#define M1200X900_R60_HSP POSITIVE
+#define M1200X900_R60_VSP POSITIVE
/* 1280x600@60 Sync Polarity (GTF Mode) */
#define M1280x600_R60_HSP NEGATIVE