diff options
author | Christian König <deathsimple@vodafone.de> | 2011-10-13 07:19:22 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 14:50:10 -0500 |
commit | bf85279958da96cb4b11aac89b34f0424c3c120e (patch) | |
tree | 1d0197a268a642ee02ebe1a22d8f5ac0e7798494 /drivers/gpu/drm/radeon/radeon_gem.c | |
parent | 5596a9db156107b01ceb7db4d50cc091117da627 (diff) |
drm/radeon: make cp variable an array
Replace cp, cp1 and cp2 members with just an array
of radeon_cp structs.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_gem.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_gem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 136772ccfe72..1ce8fa71cf73 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c | |||
@@ -152,6 +152,7 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data, | |||
152 | struct radeon_device *rdev = dev->dev_private; | 152 | struct radeon_device *rdev = dev->dev_private; |
153 | struct drm_radeon_gem_info *args = data; | 153 | struct drm_radeon_gem_info *args = data; |
154 | struct ttm_mem_type_manager *man; | 154 | struct ttm_mem_type_manager *man; |
155 | unsigned i; | ||
155 | 156 | ||
156 | man = &rdev->mman.bdev.man[TTM_PL_VRAM]; | 157 | man = &rdev->mman.bdev.man[TTM_PL_VRAM]; |
157 | 158 | ||
@@ -161,7 +162,8 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data, | |||
161 | args->vram_visible -= radeon_bo_size(rdev->stollen_vga_memory); | 162 | args->vram_visible -= radeon_bo_size(rdev->stollen_vga_memory); |
162 | args->vram_visible -= radeon_fbdev_total_size(rdev); | 163 | args->vram_visible -= radeon_fbdev_total_size(rdev); |
163 | args->gart_size = rdev->mc.gtt_size - 4096 - RADEON_IB_POOL_SIZE*64*1024; | 164 | args->gart_size = rdev->mc.gtt_size - 4096 - RADEON_IB_POOL_SIZE*64*1024; |
164 | args->gart_size -= rdev->cp.ring_size; | 165 | for(i = 0; i < RADEON_NUM_RINGS; ++i) |
166 | args->gart_size -= rdev->cp[i].ring_size; | ||
165 | return 0; | 167 | return 0; |
166 | } | 168 | } |
167 | 169 | ||