From 82dd18096c718962379e61cd8a7a0dc219db174f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Wed, 5 Aug 2020 14:35:10 +0200 Subject: [PATCH] drm/radeon: drop superflous AGP handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Dave Airlie Link: https://patchwork.freedesktop.org/patch/384336/?series=80346&rev=1 --- drivers/gpu/drm/radeon/radeon_ttm.c | 21 ++------------------- 1 file 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); } -- 2.11.0