summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorPetr Vandrovec <vandrove@vc.cvut.cz>2003-05-30 20:41:15 -0700
committerDavid S. Miller <davem@nuts.ninka.net>2003-05-30 20:41:15 -0700
commit022c22eff09201cbe3528375856e074c429f061c (patch)
tree87f0f8c1520d03adcbfe0b37aed86e39a5563ca1 /include/linux
parent032e7cc1a5749091e64fe4b3fac8c7c8b4b31180 (diff)
[PATCH] matroxfb update to new API
This updates the matroxfb driver to the new framebuffer API. I'm sorry that it is quite large, but due to completely changed underlying API there is no reasonable way how to split it into smaller pieces. - Removed support for text mode. No way for it with current API. - Removed support for hardware cursor. Generic cursor code has enough troubles as is, in software mode. - No reasonable fbset support... It is especially annoying on multihead system, as 'stty cols XXX rows YYY' does not change pixclock... - Removed fastfont support. No way for it with current API. (Mis)features inherited from generic fbdev API: - Cursor on other framebuffers than primary one does not blink. - Contents of visible, but not foreground, display is not updated.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/matroxfb.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h
index baf4bcbac93a..83fea12ad181 100644
--- a/include/linux/matroxfb.h
+++ b/include/linux/matroxfb.h
@@ -3,6 +3,7 @@
#include <asm/ioctl.h>
#include <asm/types.h>
+#include <linux/videodev2.h>
struct matroxioc_output_mode {
__u32 output; /* which output */
@@ -30,5 +31,13 @@ struct matroxioc_output_mode {
/* which outputs exist on this framebuffer */
#define MATROXFB_GET_ALL_OUTPUTS _IOR('n',0xFB,sizeof(__u32))
+enum matroxfb_ctrl_id {
+ MATROXFB_CID_TESTOUT = V4L2_CID_PRIVATE_BASE,
+ MATROXFB_CID_DEFLICKER,
+ MATROXFB_CID_LAST
+};
+
+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t)
+
#endif