.. | .. |
---|
35 | 35 | #ifndef __R128_DRV_H__ |
---|
36 | 36 | #define __R128_DRV_H__ |
---|
37 | 37 | |
---|
38 | | -#include <drm/ati_pcigart.h> |
---|
| 38 | +#include <linux/delay.h> |
---|
| 39 | +#include <linux/io.h> |
---|
| 40 | +#include <linux/irqreturn.h> |
---|
| 41 | + |
---|
| 42 | +#include <drm/drm_ioctl.h> |
---|
39 | 43 | #include <drm/drm_legacy.h> |
---|
| 44 | +#include <drm/r128_drm.h> |
---|
| 45 | + |
---|
| 46 | +#include "ati_pcigart.h" |
---|
40 | 47 | |
---|
41 | 48 | /* General customization: |
---|
42 | 49 | */ |
---|
.. | .. |
---|
397 | 404 | |
---|
398 | 405 | #define R128_PCIGART_TABLE_SIZE 32768 |
---|
399 | 406 | |
---|
400 | | -#define R128_READ(reg) DRM_READ32(dev_priv->mmio, (reg)) |
---|
401 | | -#define R128_WRITE(reg, val) DRM_WRITE32(dev_priv->mmio, (reg), (val)) |
---|
402 | | -#define R128_READ8(reg) DRM_READ8(dev_priv->mmio, (reg)) |
---|
403 | | -#define R128_WRITE8(reg, val) DRM_WRITE8(dev_priv->mmio, (reg), (val)) |
---|
| 407 | +#define R128_READ(reg) readl(((void __iomem *)dev_priv->mmio->handle) + (reg)) |
---|
| 408 | +#define R128_WRITE(reg, val) writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg)) |
---|
| 409 | +#define R128_READ8(reg) readb(((void __iomem *)dev_priv->mmio->handle) + (reg)) |
---|
| 410 | +#define R128_WRITE8(reg, val) writeb(val, ((void __iomem *)dev_priv->mmio->handle) + (reg)) |
---|
404 | 411 | |
---|
405 | 412 | #define R128_WRITE_PLL(addr, val) \ |
---|
406 | 413 | do { \ |
---|
.. | .. |
---|
445 | 452 | r128_update_ring_snapshot(dev_priv); \ |
---|
446 | 453 | if (ring->space >= ring->high_mark) \ |
---|
447 | 454 | goto __ring_space_done; \ |
---|
448 | | - DRM_UDELAY(1); \ |
---|
| 455 | + udelay(1); \ |
---|
449 | 456 | } \ |
---|
450 | 457 | DRM_ERROR("ring space check failed!\n"); \ |
---|
451 | 458 | return -EBUSY; \ |
---|