* [PATCH 2/3] alpha, drm: Remove obsolete Alpha support in MGA DRM code
@ 2011-06-09 22:19 Jay Estabrook
0 siblings, 0 replies; only message in thread
From: Jay Estabrook @ 2011-06-09 22:19 UTC (permalink / raw)
To: linux-alpha, linux-kernel, dri-devel
Cc: Matt Turner, Richard Henderson, Ivan Kokshaysky, Jay Estabrook,
airlied
Remove an obsolete Alpha adjustment in the drm for MGA on Alpha.
Signed-off-by: Jay Estabrook <jay.estabrook@gmail.com>
---
drivers/gpu/drm/mga/mga_drv.h | 19 -------------------
1 file changed, 19 deletions(-)
diff -Naurp a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
--- a/drivers/gpu/drm/mga/mga_drv.h 2011-04-26 23:48:50.000000000 -0400
+++ b/drivers/gpu/drm/mga/mga_drv.h 2011-05-02 11:51:48.000000000 -0400
@@ -195,29 +195,10 @@ extern long mga_compat_ioctl(struct file
#define mga_flush_write_combine() DRM_WRITEMEMORYBARRIER()
-#if defined(__linux__) && defined(__alpha__)
-#define MGA_BASE(reg) ((unsigned long)(dev_priv->mmio->handle))
-#define MGA_ADDR(reg) (MGA_BASE(reg) + reg)
-
-#define MGA_DEREF(reg) (*(volatile u32 *)MGA_ADDR(reg))
-#define MGA_DEREF8(reg) (*(volatile u8 *)MGA_ADDR(reg))
-
-#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)
-
-static inline u32 _MGA_READ(u32 *addr)
-{
- DRM_MEMORYBARRIER();
- return *(volatile u32 *)addr;
-}
-#else
#define MGA_READ8(reg) DRM_READ8(dev_priv->mmio, (reg))
#define MGA_READ(reg) DRM_READ32(dev_priv->mmio, (reg))
#define MGA_WRITE8(reg, val) DRM_WRITE8(dev_priv->mmio, (reg), (val))
#define MGA_WRITE(reg, val) DRM_WRITE32(dev_priv->mmio, (reg), (val))
-#endif
#define DWGREG0 0x1c00
#define DWGREG0_END 0x1dff
---
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-06-09 22:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-09 22:19 [PATCH 2/3] alpha, drm: Remove obsolete Alpha support in MGA DRM code Jay Estabrook
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.