summaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2020-09-11 17:01:21 +0300
committerChristian König <christian.koenig@amd.com>2020-09-15 17:05:19 +0300
commit9c3006a4cc1b165652a07727caf7926054f9aa9f (patch)
treee299050baec7afe6fef9269a0c4b005b37ff8cb6 /include/drm
parent5839172f09806f828319bdb2af97ca3c6cfcb432 (diff)
downloadlinux-9c3006a4cc1b165652a07727caf7926054f9aa9f.tar.xz
drm/ttm: remove available_caching
Instead of letting TTM make an educated guess based on some mask all drivers should just specify what caching they want for their CPU mappings. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/390207/
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/ttm/ttm_bo_driver.h5
-rw-r--r--include/drm/ttm/ttm_resource.h3
2 files changed, 1 insertions, 7 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index bf000d69e533..0b7d18650dc5 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -689,7 +689,6 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
*
* @bdev: ttm device
* @type: memory manager type
- * @available_caching: TTM_PL_FLAG_* for allowed caching modes
* @use_tt: if the memory manager uses tt
* @p_size: size of area to be managed in pages.
*
@@ -697,9 +696,7 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
* The range manager is installed for this device in the type slot.
*/
int ttm_range_man_init(struct ttm_bo_device *bdev,
- unsigned type,
- uint32_t available_caching,
- bool use_tt,
+ unsigned type, bool use_tt,
unsigned long p_size);
/**
diff --git a/include/drm/ttm/ttm_resource.h b/include/drm/ttm/ttm_resource.h
index a6ae4bf9c3e1..0e172d94a0c1 100644
--- a/include/drm/ttm/ttm_resource.h
+++ b/include/drm/ttm/ttm_resource.h
@@ -108,8 +108,6 @@ struct ttm_resource_manager_func {
* @gpu_offset: If used, the GPU offset of the first managed page of
* fixed memory or the first managed location in an aperture.
* @size: Size of the managed region.
- * @available_caching: A mask of available caching types, TTM_PL_FLAG_XX,
- * as defined in ttm_placement_common.h
* @func: structure pointer implementing the range manager. See above
* @move_lock: lock for move fence
* static information. bdev::driver::io_mem_free is never used.
@@ -125,7 +123,6 @@ struct ttm_resource_manager {
bool use_type;
bool use_tt;
uint64_t size;
- uint32_t available_caching;
const struct ttm_resource_manager_func *func;
spinlock_t move_lock;