diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rs400.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs400.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index 89a6e1ecea8..06b90c87f8f 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c | |||
@@ -77,7 +77,7 @@ int rs400_gart_init(struct radeon_device *rdev) | |||
77 | { | 77 | { |
78 | int r; | 78 | int r; |
79 | 79 | ||
80 | if (rdev->gart.table.ram.ptr) { | 80 | if (rdev->gart.ptr) { |
81 | WARN(1, "RS400 GART already initialized\n"); | 81 | WARN(1, "RS400 GART already initialized\n"); |
82 | return 0; | 82 | return 0; |
83 | } | 83 | } |
@@ -212,6 +212,7 @@ void rs400_gart_fini(struct radeon_device *rdev) | |||
212 | int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) | 212 | int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) |
213 | { | 213 | { |
214 | uint32_t entry; | 214 | uint32_t entry; |
215 | u32 *gtt = rdev->gart.ptr; | ||
215 | 216 | ||
216 | if (i < 0 || i > rdev->gart.num_gpu_pages) { | 217 | if (i < 0 || i > rdev->gart.num_gpu_pages) { |
217 | return -EINVAL; | 218 | return -EINVAL; |
@@ -221,7 +222,7 @@ int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) | |||
221 | ((upper_32_bits(addr) & 0xff) << 4) | | 222 | ((upper_32_bits(addr) & 0xff) << 4) | |
222 | RS400_PTE_WRITEABLE | RS400_PTE_READABLE; | 223 | RS400_PTE_WRITEABLE | RS400_PTE_READABLE; |
223 | entry = cpu_to_le32(entry); | 224 | entry = cpu_to_le32(entry); |
224 | rdev->gart.table.ram.ptr[i] = entry; | 225 | gtt[i] = entry; |
225 | return 0; | 226 | return 0; |
226 | } | 227 | } |
227 | 228 | ||