1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 4519f9c93162..6c1fc339d228 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -208,17 +208,24 @@ void rs400_gart_fini(struct radeon_device *rdev)
         radeon_gart_table_ram_free(rdev);
 }
 
+#define RS400_PTE_UNSNOOPED (1 << 0)
 #define RS400_PTE_WRITEABLE (1 << 2)
 #define RS400_PTE_READABLE  (1 << 3)
 
-void rs400_gart_set_page(struct radeon_device *rdev, unsigned i, uint64_t addr)
+void rs400_gart_set_page(struct radeon_device *rdev, unsigned i,
+                         uint64_t addr, uint32_t flags)
 {
         uint32_t entry;
         u32 *gtt = rdev->gart.ptr;
 
         entry = (lower_32_bits(addr) & PAGE_MASK) |
-                ((upper_32_bits(addr) & 0xff) << 4) |
-                RS400_PTE_WRITEABLE | RS400_PTE_READABLE;
+                ((upper_32_bits(addr) & 0xff) << 4);
+        if (flags & RADEON_GART_PAGE_READ)
+                addr |= RS400_PTE_READABLE;
+        if (flags & RADEON_GART_PAGE_WRITE)
+                addr |= RS400_PTE_WRITEABLE;
+        if (!(flags & RADEON_GART_PAGE_SNOOP))
+                entry |= RS400_PTE_UNSNOOPED;
         entry = cpu_to_le32(entry);
         gtt[i] = entry;
 }