diff options
| author | Eric Anholt <anholt@freebsd.org> | 2003-02-21 07:16:52 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2003-02-21 07:16:52 +0000 |
| commit | 734270fb379417d5c13550423556999ee93b4b4f (patch) | |
| tree | 29424ae56072f69c52cf44ddb06045c76b36191e /shared-core/mga_drv.h | |
| parent | ae0ee9a2f7f84196a616026a5974c8196dc7ab97 (diff) | |
Merge from trunk to bsd-4-0-0-branch.bsd-4-0-0-20030220bsd-4-0-0-branch
Diffstat (limited to 'shared-core/mga_drv.h')
| -rw-r--r-- | shared-core/mga_drv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/mga_drv.h b/shared-core/mga_drv.h index d7f85af5..0e650b42 100644 --- a/shared-core/mga_drv.h +++ b/shared-core/mga_drv.h @@ -142,12 +142,12 @@ extern int mga_warp_init( drm_mga_private_t *dev_priv ); #define MGA_READ( reg ) (_MGA_READ((u32 *)MGA_ADDR(reg))) #define MGA_READ8( reg ) (_MGA_READ((u8 *)MGA_ADDR(reg))) -#define MGA_WRITE( reg, val ) do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF( reg ) = val; } while (0) -#define MGA_WRITE8( reg, val ) do { DRM_WRITEMEMORYBARRIER(); MGA_DEREF8( reg ) = val; } while (0) +#define MGA_WRITE( reg, val ) do { DRM_WRITEMEMORYBARRIER(dev_priv->mmio); MGA_DEREF( reg ) = val; } while (0) +#define MGA_WRITE8( reg, val ) do { DRM_WRITEMEMORYBARRIER(dev_priv->mmio); MGA_DEREF8( reg ) = val; } while (0) static inline u32 _MGA_READ(u32 *addr) { - DRM_READMEMORYBARRIER(); + DRM_READMEMORYBARRIER(dev_priv->mmio); return *(volatile u32 *)addr; } #else |