forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/gpu/drm/via/via_dma.c
....@@ -34,8 +34,15 @@
3434 * Thomas Hellstrom.
3535 */
3636
37
-#include <drm/drmP.h>
37
+#include <linux/delay.h>
38
+#include <linux/uaccess.h>
39
+
40
+#include <drm/drm.h>
41
+#include <drm/drm_agpsupport.h>
42
+#include <drm/drm_device.h>
43
+#include <drm/drm_file.h>
3844 #include <drm/via_drm.h>
45
+
3946 #include "via_drv.h"
4047 #include "via_3d_reg.h"
4148
....@@ -430,14 +437,14 @@
430437 diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
431438 count = 10000000;
432439 while (diff == 0 && count--) {
433
- paused = (VIA_READ(0x41c) & 0x80000000);
440
+ paused = (via_read(dev_priv, 0x41c) & 0x80000000);
434441 if (paused)
435442 break;
436443 reader = *(dev_priv->hw_addr_ptr);
437444 diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
438445 }
439446
440
- paused = VIA_READ(0x41c) & 0x80000000;
447
+ paused = via_read(dev_priv, 0x41c) & 0x80000000;
441448
442449 if (paused && !no_pci_fire) {
443450 reader = *(dev_priv->hw_addr_ptr);
....@@ -454,10 +461,10 @@
454461 * doesn't make a difference.
455462 */
456463
457
- VIA_WRITE(VIA_REG_TRANSET, (HC_ParaType_PreCR << 16));
458
- VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_hi);
459
- VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_lo);
460
- VIA_READ(VIA_REG_TRANSPACE);
464
+ via_write(dev_priv, VIA_REG_TRANSET, (HC_ParaType_PreCR << 16));
465
+ via_write(dev_priv, VIA_REG_TRANSPACE, pause_addr_hi);
466
+ via_write(dev_priv, VIA_REG_TRANSPACE, pause_addr_lo);
467
+ via_read(dev_priv, VIA_REG_TRANSPACE);
461468 }
462469 }
463470 return paused;
....@@ -467,10 +474,10 @@
467474 {
468475 int count = 10000000;
469476
470
- while (!(VIA_READ(VIA_REG_STATUS) & VIA_VR_QUEUE_BUSY) && --count)
477
+ while (!(via_read(dev_priv, VIA_REG_STATUS) & VIA_VR_QUEUE_BUSY) && --count)
471478 ;
472479
473
- while (count && (VIA_READ(VIA_REG_STATUS) &
480
+ while (count && (via_read(dev_priv, VIA_REG_STATUS) &
474481 (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY |
475482 VIA_3D_ENG_BUSY)))
476483 --count;
....@@ -536,21 +543,21 @@
536543 via_flush_write_combine();
537544 (void) *(volatile uint32_t *)dev_priv->last_pause_ptr;
538545
539
- VIA_WRITE(VIA_REG_TRANSET, (HC_ParaType_PreCR << 16));
540
- VIA_WRITE(VIA_REG_TRANSPACE, command);
541
- VIA_WRITE(VIA_REG_TRANSPACE, start_addr_lo);
542
- VIA_WRITE(VIA_REG_TRANSPACE, end_addr_lo);
546
+ via_write(dev_priv, VIA_REG_TRANSET, (HC_ParaType_PreCR << 16));
547
+ via_write(dev_priv, VIA_REG_TRANSPACE, command);
548
+ via_write(dev_priv, VIA_REG_TRANSPACE, start_addr_lo);
549
+ via_write(dev_priv, VIA_REG_TRANSPACE, end_addr_lo);
543550
544
- VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_hi);
545
- VIA_WRITE(VIA_REG_TRANSPACE, pause_addr_lo);
551
+ via_write(dev_priv, VIA_REG_TRANSPACE, pause_addr_hi);
552
+ via_write(dev_priv, VIA_REG_TRANSPACE, pause_addr_lo);
546553 wmb();
547
- VIA_WRITE(VIA_REG_TRANSPACE, command | HC_HAGPCMNT_MASK);
548
- VIA_READ(VIA_REG_TRANSPACE);
554
+ via_write(dev_priv, VIA_REG_TRANSPACE, command | HC_HAGPCMNT_MASK);
555
+ via_read(dev_priv, VIA_REG_TRANSPACE);
549556
550557 dev_priv->dma_diff = 0;
551558
552559 count = 10000000;
553
- while (!(VIA_READ(0x41c) & 0x80000000) && count--);
560
+ while (!(via_read(dev_priv, 0x41c) & 0x80000000) && count--);
554561
555562 reader = *(dev_priv->hw_addr_ptr);
556563 ptr = ((volatile char *)dev_priv->last_pause_ptr - dev_priv->dma_ptr) +