aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs400.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/rs400.c')
-rw-r--r--drivers/gpu/drm/radeon/rs400.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 130d5cc50d43..a0f96decece3 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -212,21 +212,16 @@ void rs400_gart_fini(struct radeon_device *rdev)
212#define RS400_PTE_WRITEABLE (1 << 2) 212#define RS400_PTE_WRITEABLE (1 << 2)
213#define RS400_PTE_READABLE (1 << 3) 213#define RS400_PTE_READABLE (1 << 3)
214 214
215int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) 215void rs400_gart_set_page(struct radeon_device *rdev, unsigned i, uint64_t addr)
216{ 216{
217 uint32_t entry; 217 uint32_t entry;
218 u32 *gtt = rdev->gart.ptr; 218 u32 *gtt = rdev->gart.ptr;
219 219
220 if (i < 0 || i > rdev->gart.num_gpu_pages) {
221 return -EINVAL;
222 }
223
224 entry = (lower_32_bits(addr) & PAGE_MASK) | 220 entry = (lower_32_bits(addr) & PAGE_MASK) |
225 ((upper_32_bits(addr) & 0xff) << 4) | 221 ((upper_32_bits(addr) & 0xff) << 4) |
226 RS400_PTE_WRITEABLE | RS400_PTE_READABLE; 222 RS400_PTE_WRITEABLE | RS400_PTE_READABLE;
227 entry = cpu_to_le32(entry); 223 entry = cpu_to_le32(entry);
228 gtt[i] = entry; 224 gtt[i] = entry;
229 return 0;
230} 225}
231 226
232int rs400_mc_wait_for_idle(struct radeon_device *rdev) 227int rs400_mc_wait_for_idle(struct radeon_device *rdev)