Ticket #328: dcon.patch

drivers/video/geode/gxfb_dcon.c

@@ -143 +143 @@
                 dcon_disp_mode &= ~(MODE_CSWIZZLE | MODE_COL_AA);
                 dcon_disp_mode |= MODE_MONO_LUMA;
         }
-        else {
+        else if (arg == DCON_OUTPUT_GREEN) {
+                dcon_disp_mode &= ~(MODE_MONO_LUMA | MODE_CSWIZZLE | MODE_COL_AA);
+        }
+        else if (arg == DCON_OUTPUT_UNFILTERED) {
+                dcon_disp_mode &= ~(MODE_MONO_LUMA | MODE_COL_AA);
+                dcon_disp_mode |= MODE_CSWIZZLE;
+        }
+        else if (arg == DCON_OUTPUT_FILTERED) {
+                dcon_disp_mode &= ~(MODE_MONO_LUMA);
+                dcon_disp_mode |= (MODE_CSWIZZLE | MODE_COL_AA);
+        }
+        else /* if (arg == DCON_OUTPUT_COLOR) */ {
                 dcon_disp_mode &= ~(MODE_MONO_LUMA);
                 dcon_disp_mode |= MODE_CSWIZZLE;
                 if (useaa)
@@ -281 +292 @@
                 if (get_user(karg, (int __user *)arg))
                         return -EFAULT;
 
-                if (karg > 1 || karg < -1)
+                if (karg > DCON_OUTPUT_MAX || karg < -1)
                         return -EINVAL;
 
                 if (karg > -1)
@@ -412 +423 @@
         if (_strtoul(buf, count, &output))
                 return -EINVAL;
 
-        if (output == DCON_OUTPUT_COLOR || output == DCON_OUTPUT_MONO) {
+        if (output >= 0 && output <= DCON_OUTPUT_MAX) {
                 dcon_set_output(output);
                 rc = count;
         }

drivers/video/geode/gxfb_dcon.h

@@ -62 +62 @@
 #define DCON_SOURCE_CPU         1
 
 /* Output values */
+#define DCON_OUTPUT_QUERY      -1
 #define DCON_OUTPUT_COLOR       0
 #define DCON_OUTPUT_MONO        1
+#define DCON_OUTPUT_GREEN       2
+#define DCON_OUTPUT_FILTERED    3
+#define DCON_OUTPUT_UNFILTERED  4
+#define DCON_OUTPUT_MAX         DCON_OUTPUT_UNFILTERED
 
 /* Sleep values */
 #define DCON_ACTIVE             0