drm/radeon: drop superflous AGP handling
authorChristian König <christian.koenig@amd.com>
Wed, 5 Aug 2020 12:35:10 +0000 (14:35 +0200)
committerChristian König <christian.koenig@amd.com>
Wed, 12 Aug 2020 13:51:10 +0000 (15:51 +0200)
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
drivers/gpu/drm/radeon/radeon_ttm.c

index 31f4cf2..290c8b4 100644 (file)
@@ -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);
 }