1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/gpu/drm/radeon/si_dma.c b/drivers/gpu/drm/radeon/si_dma.c
index 49909d23dfce..8e8f46133532 100644
--- a/drivers/gpu/drm/radeon/si_dma.c
+++ b/drivers/gpu/drm/radeon/si_dma.c
@@ -24,6 +24,7 @@
 #include <drm/drmP.h>
 #include "radeon.h"
 #include "radeon_asic.h"
+#include "radeon_trace.h"
 #include "sid.h"
 
 u32 si_gpu_check_soft_reset(struct radeon_device *rdev);
@@ -75,11 +76,12 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
                         uint64_t addr, unsigned count,
                         uint32_t incr, uint32_t flags)
 {
-        uint32_t r600_flags = cayman_vm_page_flags(rdev, flags);
         uint64_t value;
         unsigned ndw;
 
-        if (flags & RADEON_VM_PAGE_SYSTEM) {
+        trace_radeon_vm_set_page(pe, addr, count, incr, flags);
+
+        if (flags & R600_PTE_SYSTEM) {
                 while (count) {
                         ndw = count * 2;
                         if (ndw > 0xFFFFE)
@@ -90,16 +92,10 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
                         ib->ptr[ib->length_dw++] = pe;
                         ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;
                         for (; ndw > 0; ndw -= 2, --count, pe += 8) {
-                                if (flags & RADEON_VM_PAGE_SYSTEM) {
-                                        value = radeon_vm_map_gart(rdev, addr);
-                                        value &= 0xFFFFFFFFFFFFF000ULL;
-                                } else if (flags & RADEON_VM_PAGE_VALID) {
-                                        value = addr;
-                                } else {
-                                        value = 0;
-                                }
+                                value = radeon_vm_map_gart(rdev, addr);
+                                value &= 0xFFFFFFFFFFFFF000ULL;
                                 addr += incr;
-                                value |= r600_flags;
+                                value |= flags;
                                 ib->ptr[ib->length_dw++] = value;
                                 ib->ptr[ib->length_dw++] = upper_32_bits(value);
                         }
@@ -110,7 +106,7 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
                         if (ndw > 0xFFFFE)
                                 ndw = 0xFFFFE;
 
-                        if (flags & RADEON_VM_PAGE_VALID)
+                        if (flags & R600_PTE_VALID)
                                 value = addr;
                         else
                                 value = 0;
@@ -118,7 +114,7 @@ void si_dma_vm_set_page(struct radeon_device *rdev,
                         ib->ptr[ib->length_dw++] = DMA_PTE_PDE_PACKET(ndw);
                         ib->ptr[ib->length_dw++] = pe; /* dst addr */
                         ib->ptr[ib->length_dw++] = upper_32_bits(pe) & 0xff;
-                        ib->ptr[ib->length_dw++] = r600_flags; /* mask */
+                        ib->ptr[ib->length_dw++] = flags; /* mask */
                         ib->ptr[ib->length_dw++] = 0;
                         ib->ptr[ib->length_dw++] = value; /* value */
                         ib->ptr[ib->length_dw++] = upper_32_bits(value);