hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/drivers/gpu/drm/via/via_verifier.c
....@@ -28,13 +28,13 @@
2828 * be very slow.
2929 */
3030
31
-#include "via_3d_reg.h"
32
-#include <drm/drmP.h>
33
-#include <drm/via_drm.h>
31
+#include <drm/drm_device.h>
3432 #include <drm/drm_legacy.h>
35
-#include "via_verifier.h"
33
+#include <drm/via_drm.h>
34
+
35
+#include "via_3d_reg.h"
3636 #include "via_drv.h"
37
-#include <linux/kernel.h>
37
+#include "via_verifier.h"
3838
3939 typedef enum {
4040 state_command,
....@@ -725,14 +725,14 @@
725725 next_fire = dev_priv->fire_offsets[*fire_count];
726726 buf++;
727727 cmd = (*buf & 0xFFFF0000) >> 16;
728
- VIA_WRITE(HC_REG_TRANS_SET + HC_REG_BASE, *buf++);
728
+ via_write(dev_priv, HC_REG_TRANS_SET + HC_REG_BASE, *buf++);
729729 switch (cmd) {
730730 case HC_ParaType_CmdVdata:
731731 while ((buf < buf_end) &&
732732 (*fire_count < dev_priv->num_fire_offsets) &&
733733 (*buf & HC_ACMD_MASK) == HC_ACMD_HCmdB) {
734734 while (buf <= next_fire) {
735
- VIA_WRITE(HC_REG_TRANS_SPACE + HC_REG_BASE +
735
+ via_write(dev_priv, HC_REG_TRANS_SPACE + HC_REG_BASE +
736736 (burst & 63), *buf++);
737737 burst += 4;
738738 }
....@@ -753,7 +753,7 @@
753753 (*buf & VIA_VIDEOMASK) == VIA_VIDEO_HEADER6)
754754 break;
755755
756
- VIA_WRITE(HC_REG_TRANS_SPACE + HC_REG_BASE +
756
+ via_write(dev_priv, HC_REG_TRANS_SPACE + HC_REG_BASE +
757757 (burst & 63), *buf++);
758758 burst += 4;
759759 }
....@@ -843,7 +843,7 @@
843843 cmd = *buf;
844844 if ((cmd & HALCYON_HEADER1MASK) != HALCYON_HEADER1)
845845 break;
846
- VIA_WRITE((cmd & ~HALCYON_HEADER1MASK) << 2, *++buf);
846
+ via_write(dev_priv, (cmd & ~HALCYON_HEADER1MASK) << 2, *++buf);
847847 buf++;
848848 }
849849 *buffer = buf;
....@@ -894,7 +894,7 @@
894894 i = count = *buf;
895895 buf += 3;
896896 while (i--)
897
- VIA_WRITE(addr, *buf++);
897
+ via_write(dev_priv, addr, *buf++);
898898 if (count & 3)
899899 buf += 4 - (count & 3);
900900 *buffer = buf;
....@@ -950,7 +950,7 @@
950950 buf += 3;
951951 while (i--) {
952952 addr = *buf++;
953
- VIA_WRITE(addr, *buf++);
953
+ via_write(dev_priv, addr, *buf++);
954954 }
955955 count <<= 1;
956956 if (count & 3)