summaryrefslogtreecommitdiff
path: root/src/glamo.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-01-29 04:39:45 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-01-29 04:39:45 +0100
commita8c0b0fabc6d25e362b8ed9dedfd9f33063a7469 (patch)
tree212f8de42d9d55dcc6ff75d6792906e87beb8df9 /src/glamo.h
parentf3876ab039ebc56f4197165a4ec770631f2d7156 (diff)
Rework cmdq dispatch. Its a lot faster now since its dosn't restart the chip
every time it dispatches the cmdq and allow parralel cmd execution.
Diffstat (limited to 'src/glamo.h')
-rw-r--r--src/glamo.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glamo.h b/src/glamo.h
index 735d99c..aedef04 100644
--- a/src/glamo.h
+++ b/src/glamo.h
@@ -81,7 +81,7 @@ MMIO_OUT16(__volatile__ void *base, const unsigned long offset,
static __inline__ CARD16
MMIO_IN16(__volatile__ void *base, const unsigned long offset)
{
- register unsigned short val;
+ unsigned short val;
__asm__ __volatile__(
"ldrh %0, [%1, +%2]"
: "=r" (val)
@@ -152,7 +152,7 @@ typedef struct {
int cmd_queue_cache_start;
/* What was GLAMOCardInfo */
- char *reg_base;
+ volatile char *reg_base;
Bool is_3362;
CARD32 crtc_pitch;
CARD32 crtc2_pitch;
@@ -162,7 +162,7 @@ typedef struct {
#define GlamoPTR(p) ((GlamoPtr)((p)->driverPrivate))
static inline void
-MMIOSetBitMask(char *mmio, CARD32 reg, CARD16 mask, CARD16 val)
+MMIOSetBitMask(volatile char *mmio, CARD32 reg, CARD16 mask, CARD16 val)
{
CARD16 tmp;