aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_ttm.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-04-07 06:21:27 -0400
committerDave Airlie <airlied@redhat.com>2010-04-20 00:13:09 -0400
commit0c321c79627189204d7d0bf65ab19f5ac419abed (patch)
tree9df52ae46164bdca3dab6a36d5ec17360c60b9e4 /drivers/gpu/drm/radeon/radeon_ttm.c
parent96bf8b8778976a6e6a4fe4e6e0421d8ed7892798 (diff)
drm/ttm: remove io_ field from TTM V6
All TTM driver have been converted to new io_mem_reserve/free interface which allow driver to choose and return proper io base, offset to core TTM for ioremapping if necessary. This patch remove what is now deadcode. V2 adapt to match with change in first patch of the patchset V3 update after io_mem_reserve/io_mem_free callback balancing V4 adjust to minor cleanup V5 remove the needs ioremap flag V6 keep the ioremapping facility in TTM [airlied- squashed driver removals in here also] Signed-off-by: Jerome Glisse <jglisse@redhat.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ttm.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 62b4b800e0a3..91030eab22b0 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -161,21 +161,13 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
161 (unsigned)type); 161 (unsigned)type);
162 return -EINVAL; 162 return -EINVAL;
163 } 163 }
164 man->io_offset = rdev->mc.agp_base;
165 man->io_size = rdev->mc.gtt_size;
166 man->io_addr = NULL;
167 if (!rdev->ddev->agp->cant_use_aperture) 164 if (!rdev->ddev->agp->cant_use_aperture)
168 man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; 165 man->flags = TTM_MEMTYPE_FLAG_MAPPABLE;
169 man->available_caching = TTM_PL_FLAG_UNCACHED | 166 man->available_caching = TTM_PL_FLAG_UNCACHED |
170 TTM_PL_FLAG_WC; 167 TTM_PL_FLAG_WC;
171 man->default_caching = TTM_PL_FLAG_WC; 168 man->default_caching = TTM_PL_FLAG_WC;
172 } else
173#endif
174 {
175 man->io_offset = 0;
176 man->io_size = 0;
177 man->io_addr = NULL;
178 } 169 }
170#endif
179 break; 171 break;
180 case TTM_PL_VRAM: 172 case TTM_PL_VRAM:
181 /* "On-card" video ram */ 173 /* "On-card" video ram */
@@ -184,9 +176,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
184 TTM_MEMTYPE_FLAG_MAPPABLE; 176 TTM_MEMTYPE_FLAG_MAPPABLE;
185 man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC; 177 man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
186 man->default_caching = TTM_PL_FLAG_WC; 178 man->default_caching = TTM_PL_FLAG_WC;
187 man->io_addr = NULL;
188 man->io_offset = rdev->mc.aper_base;
189 man->io_size = rdev->mc.aper_size;
190 break; 179 break;
191 default: 180 default:
192 DRM_ERROR("Unsupported memory type %u\n", (unsigned)type); 181 DRM_ERROR("Unsupported memory type %u\n", (unsigned)type);