summaryrefslogtreecommitdiff
path: root/src/glamo.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-02-19 17:51:00 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-02-19 17:51:00 +0100
commit0b537b064c59af7eff9a73f0bdc8fa58c93a4047 (patch)
tree17f63ae5e0e2f9386632447b09ea10afde714798 /src/glamo.h
parent8062d7aa7bac7e06c1a00bd88ca78098550606ed (diff)
Add basic RandR 1.2 support.
Diffstat (limited to 'src/glamo.h')
-rw-r--r--src/glamo.h22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/glamo.h b/src/glamo.h
index d65019b..a8807d5 100644
--- a/src/glamo.h
+++ b/src/glamo.h
@@ -35,6 +35,7 @@
#include "xf86.h"
#include "exa.h"
+#include <linux/fb.h>
#define GLAMO_REG_BASE(c) ((c)->attr.address[0])
#define GLAMO_REG_SIZE(c) (0x2400)
@@ -108,11 +109,6 @@ typedef struct _MemBuf {
} MemBuf;
typedef struct {
- unsigned char* fbstart;
- unsigned char* fbmem;
- int fboff;
- int lineLength;
- int rotate;
Bool shadowFB;
void *shadow;
CloseScreenProcPtr CloseScreen;
@@ -155,6 +151,14 @@ typedef struct {
CARD32 crtc_pitch;
CARD32 crtc2_pitch;
+ /* linux framebuffer */
+ int fb_fd;
+ struct fb_var_screeninfo fb_var;
+ struct fb_fix_screeninfo fb_fix;
+ unsigned char *fbstart;
+ unsigned char *fbmem;
+ int fboff;
+ int lineLength;
} GlamoRec, *GlamoPtr;
#define GlamoPTR(p) ((GlamoPtr)((p)->driverPrivate))
@@ -195,4 +199,12 @@ GLAMORecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef);
Bool
GLAMODrawExaInit(ScreenPtr pScreen, ScrnInfoPtr pScrn);
+/* glamo-display.h */
+Bool
+GlamoCrtcInit(ScrnInfoPtr pScrn);
+
+/* glamo-output.h */
+void
+GlamoOutputInit(ScrnInfoPtr pScrn);
+
#endif /* _GLAMO_H_ */