forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/gpu/drm/r128/r128_drv.h
....@@ -35,8 +35,15 @@
3535 #ifndef __R128_DRV_H__
3636 #define __R128_DRV_H__
3737
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>
3943 #include <drm/drm_legacy.h>
44
+#include <drm/r128_drm.h>
45
+
46
+#include "ati_pcigart.h"
4047
4148 /* General customization:
4249 */
....@@ -397,10 +404,10 @@
397404
398405 #define R128_PCIGART_TABLE_SIZE 32768
399406
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))
404411
405412 #define R128_WRITE_PLL(addr, val) \
406413 do { \
....@@ -445,7 +452,7 @@
445452 r128_update_ring_snapshot(dev_priv); \
446453 if (ring->space >= ring->high_mark) \
447454 goto __ring_space_done; \
448
- DRM_UDELAY(1); \
455
+ udelay(1); \
449456 } \
450457 DRM_ERROR("ring space check failed!\n"); \
451458 return -EBUSY; \