diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:46:10 -0800 |
| commit | 52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch) | |
| tree | 86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /drivers/gpu/drm/radeon/rs400.c | |
| parent | e9b7086b80c4d9e354f4edc9e280ae85a60df408 (diff) | |
| parent | 8770b07c2dff3cec2c751b289ee690137c88ea54 (diff) | |
| download | linux-52f3a41e0aca5625fbd118ed57a4debb25817e99.tar.gz | |
Merge branch 'fixes-v3.2-rc2' into fixes
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 89a6e1ecea8d..06b90c87f8f3 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) { int r; - if (rdev->gart.table.ram.ptr) { + if (rdev->gart.ptr) { WARN(1, "RS400 GART already initialized\n"); return 0; } @@ -212,6 +212,7 @@ void rs400_gart_fini(struct radeon_device *rdev) int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) { uint32_t entry; + u32 *gtt = rdev->gart.ptr; if (i < 0 || i > rdev->gart.num_gpu_pages) { return -EINVAL; @@ -221,7 +222,7 @@ int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) ((upper_32_bits(addr) & 0xff) << 4) | RS400_PTE_WRITEABLE | RS400_PTE_READABLE; entry = cpu_to_le32(entry); - rdev->gart.table.ram.ptr[i] = entry; + gtt[i] = entry; return 0; } |