summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2020-08-05 15:35:10 +0300
committerChristian König <christian.koenig@amd.com>2020-08-12 16:51:10 +0300
commit82dd18096c718962379e61cd8a7a0dc219db174f (patch)
tree5f08ddf7870969b9ca6fcf7956ce14863d6d8ee9 /drivers/gpu
parentb2458726b38cb69f3da3677dbdf53e47af0e8792 (diff)
downloadlinux-82dd18096c718962379e61cd8a7a0dc219db174f.tar.xz
drm/radeon: drop superflous AGP handling
The object flags created in radeon_ttm_placement_from_domain take care that we use the correct caching for AGP, this is just superflous. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/384336/?series=80346&rev=1
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_ttm.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 31f4cf211b6a..290c8b479853 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -76,26 +76,9 @@ static int radeon_ttm_init_vram(struct radeon_device *rdev)
static int radeon_ttm_init_gtt(struct radeon_device *rdev)
{
- uint32_t available_caching, default_caching;
-
- available_caching = TTM_PL_MASK_CACHING;
- default_caching = TTM_PL_FLAG_CACHED;
-
-#if IS_ENABLED(CONFIG_AGP)
- if (rdev->flags & RADEON_IS_AGP) {
- if (!rdev->ddev->agp) {
- DRM_ERROR("AGP is not enabled\n");
- return -EINVAL;
- }
- available_caching = TTM_PL_FLAG_UNCACHED |
- TTM_PL_FLAG_WC;
- default_caching = TTM_PL_FLAG_WC;
- }
-#endif
-
return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_TT,
- available_caching,
- default_caching, true,
+ TTM_PL_MASK_CACHING,
+ TTM_PL_FLAG_CACHED, true,
rdev->mc.gtt_size >> PAGE_SHIFT);
}