diff options
| author | Christian König <christian.koenig@amd.com> | 2020-09-11 17:01:21 +0300 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-09-15 17:05:19 +0300 |
| commit | 9c3006a4cc1b165652a07727caf7926054f9aa9f (patch) | |
| tree | e299050baec7afe6fef9269a0c4b005b37ff8cb6 /drivers/gpu/drm/ttm | |
| parent | 5839172f09806f828319bdb2af97ca3c6cfcb432 (diff) | |
| download | linux-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 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_range_manager.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_resource.c | 1 |
3 files changed, 3 insertions, 11 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 43c0a5f09d67..ee2632128d3c 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -910,11 +910,8 @@ static int ttm_bo_mem_placement(struct ttm_buffer_object *bo, if (!man || !ttm_resource_manager_used(man)) return -EBUSY; - if ((place->flags & man->available_caching) == 0) - return -EBUSY; - - cur_flags = place->flags & man->available_caching; - cur_flags = ttm_bo_select_caching(man, bo->mem.placement, cur_flags); + cur_flags = ttm_bo_select_caching(man, bo->mem.placement, + place->flags); cur_flags |= place->flags & ~TTM_PL_MASK_CACHING; mem->mem_type = place->mem_type; @@ -1432,7 +1429,6 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev) * Other types need to be driver / IOCTL initialized. */ man->use_tt = true; - man->available_caching = TTM_PL_MASK_CACHING; ttm_resource_manager_init(man, 0); ttm_set_driver_manager(bdev, TTM_PL_SYSTEM, man); diff --git a/drivers/gpu/drm/ttm/ttm_range_manager.c b/drivers/gpu/drm/ttm/ttm_range_manager.c index c80d9fa022f7..1da0e277c511 100644 --- a/drivers/gpu/drm/ttm/ttm_range_manager.c +++ b/drivers/gpu/drm/ttm/ttm_range_manager.c @@ -113,9 +113,7 @@ static void ttm_range_man_free(struct ttm_resource_manager *man, static const struct ttm_resource_manager_func ttm_range_manager_func; 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) { struct ttm_resource_manager *man; @@ -126,7 +124,6 @@ int ttm_range_man_init(struct ttm_bo_device *bdev, return -ENOMEM; man = &rman->manager; - man->available_caching = available_caching; man->use_tt = use_tt; man->func = &ttm_range_manager_func; diff --git a/drivers/gpu/drm/ttm/ttm_resource.c b/drivers/gpu/drm/ttm/ttm_resource.c index 80e10c28f3e8..b325b9264203 100644 --- a/drivers/gpu/drm/ttm/ttm_resource.c +++ b/drivers/gpu/drm/ttm/ttm_resource.c @@ -140,7 +140,6 @@ void ttm_resource_manager_debug(struct ttm_resource_manager *man, drm_printf(p, " use_type: %d\n", man->use_type); drm_printf(p, " use_tt: %d\n", man->use_tt); drm_printf(p, " size: %llu\n", man->size); - drm_printf(p, " available_caching: 0x%08X\n", man->available_caching); if (man->func && man->func->debug) (*man->func->debug)(man, p); } |