drm/ttm: remove default caching

As far as I can tell this was never used either and we just
always fallback to the order cached > wc > uncached anyway.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/390142/

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 2b1b7c136343d1e80710f24d7574d1d0510b81e3..12d6a018e60b309e7952409a6f971f2a45664ff3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -96,7 +96,6 @@ int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
        man->use_tt = true;
        man->func = &amdgpu_gtt_mgr_func;
        man->available_caching = TTM_PL_MASK_CACHING;
-       man->default_caching = TTM_PL_FLAG_CACHED;
 
        ttm_resource_manager_init(man, gtt_size >> PAGE_SHIFT);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 6fc3af082f6fdd2e4fd3b0c8e2b1d1ec27ceb12d..15ce752b127c96cd864276fad24cd3d508c427c0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -68,7 +68,7 @@ static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
                                    uint64_t size)
 {
        return ttm_range_man_init(&adev->mman.bdev, type,
-                                 TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED,
+                                 TTM_PL_FLAG_UNCACHED,
                                  false, size >> PAGE_SHIFT);
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index b2adc2abc581053ef90af2be0cfe1d086d966f72..f809d84ccda2003a361c3aa4cf727f8962f8990e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -180,7 +180,6 @@ int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
        int ret;
 
        man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-       man->default_caching = TTM_PL_FLAG_WC;
 
        ttm_resource_manager_init(man, adev->gmc.real_vram_size >> PAGE_SHIFT);
 

diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index 4291f0b71021b0d1203e81f211b1f0e962495286..fff42bb56646b941d7d54a991d82afeff81e5345 100644 (file)
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -1058,8 +1058,7 @@ static int drm_vram_mm_init(struct drm_vram_mm *vmm, struct drm_device *dev,
 
        ret = ttm_range_man_init(&vmm->bdev, TTM_PL_VRAM,
                                 TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
-                                TTM_PL_FLAG_WC, false,
-                                vram_size >> PAGE_SHIFT);
+                                false, vram_size >> PAGE_SHIFT);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index a62f37b1131ca68ab440021dba83c37e6e719e5c..cf18f75cd0f1a07697eef0842f0a01f146d98709 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -203,12 +203,9 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
                        return -ENOMEM;
 
                man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-               man->default_caching = TTM_PL_FLAG_WC;
 
-               if (type & NVIF_MEM_UNCACHED) {
+               if (type & NVIF_MEM_UNCACHED)
                        man->available_caching = TTM_PL_FLAG_UNCACHED;
-                       man->default_caching = TTM_PL_FLAG_UNCACHED;
-               }
 
                man->func = &nouveau_vram_manager;
 
@@ -220,7 +217,7 @@ nouveau_ttm_init_vram(struct nouveau_drm *drm)
        } else {
                return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_VRAM,
                                          TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
-                                         TTM_PL_FLAG_WC, false,
+                                         false,
                                          drm->gem.vram_available >> PAGE_SHIFT);
        }
 }
@@ -245,16 +242,14 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 {
        struct ttm_resource_manager *man;
        unsigned long size_pages = drm->gem.gart_available >> PAGE_SHIFT;
-       unsigned available_caching, default_caching;
        const struct ttm_resource_manager_func *func = NULL;
-       if (drm->agp.bridge) {
+       unsigned available_caching;
+
+       if (drm->agp.bridge)
                available_caching = TTM_PL_FLAG_UNCACHED |
                        TTM_PL_FLAG_WC;
-               default_caching = TTM_PL_FLAG_WC;
-       } else {
+       else
                available_caching = TTM_PL_MASK_CACHING;
-               default_caching = TTM_PL_FLAG_CACHED;
-       }
 
        if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)
                func = &nouveau_gart_manager;
@@ -262,8 +257,7 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
                func = &nv04_gart_manager;
        else
                return ttm_range_man_init(&drm->ttm.bdev, TTM_PL_TT,
-                                         available_caching, default_caching,
-                                         true,
+                                         available_caching, true,
                                          size_pages);
 
        man = kzalloc(sizeof(*man), GFP_KERNEL);
@@ -272,7 +266,6 @@ nouveau_ttm_init_gtt(struct nouveau_drm *drm)
 
        man->func = func;
        man->available_caching = available_caching;
-       man->default_caching = default_caching;
        man->use_tt = true;
        ttm_resource_manager_init(man, size_pages);
        ttm_set_driver_manager(&drm->ttm.bdev, TTM_PL_TT, man);

diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 5ffc8b752f01b5e4014ee506c9db4b2ec540de8d..d39d7994ea34937d1fc803298b7d7988681b3f53 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -203,7 +203,7 @@ static int qxl_ttm_init_mem_type(struct qxl_device *qdev,
                                 uint64_t size)
 {
        return ttm_range_man_init(&qdev->mman.bdev, type, TTM_PL_MASK_CACHING,
-                                 TTM_PL_FLAG_CACHED, false, size);
+                                 false, size);
 }
 
 int qxl_ttm_init(struct qxl_device *qdev)

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 602a591a53dc71aa1339ccdbd1e15a461151a6f2..b8e60b3630d7f2517bb7a119da5ae0fd96f11ec2 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -70,16 +70,14 @@ static int radeon_ttm_init_vram(struct radeon_device *rdev)
 {
        return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_VRAM,
                                  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC,
-                                 TTM_PL_FLAG_WC, false,
-                                 rdev->mc.real_vram_size >> PAGE_SHIFT);
+                                 false, rdev->mc.real_vram_size >> PAGE_SHIFT);
 }
 
 static int radeon_ttm_init_gtt(struct radeon_device *rdev)
 {
        return ttm_range_man_init(&rdev->mman.bdev, TTM_PL_TT,
                                  TTM_PL_MASK_CACHING,
-                                 TTM_PL_FLAG_CACHED, true,
-                                 rdev->mc.gtt_size >> PAGE_SHIFT);
+                                 true, rdev->mc.gtt_size >> PAGE_SHIFT);
 }
 
 static void radeon_evict_flags(struct ttm_buffer_object *bo,

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index e2bfe3a13c63d71096710f67b9ee991c9b654707..43c0a5f09d671784db1ef69add9c187d234fee57 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -876,8 +876,6 @@ static uint32_t ttm_bo_select_caching(struct ttm_resource_manager *man,
 
        if ((cur_placement & caching) != 0)
                result |= (cur_placement & caching);
-       else if ((man->default_caching & caching) != 0)
-               result |= man->default_caching;
        else if ((TTM_PL_FLAG_CACHED & caching) != 0)
                result |= TTM_PL_FLAG_CACHED;
        else if ((TTM_PL_FLAG_WC & caching) != 0)
@@ -1435,7 +1433,6 @@ static void ttm_bo_init_sysman(struct ttm_bo_device *bdev)
         */
        man->use_tt = true;
        man->available_caching = TTM_PL_MASK_CACHING;
-       man->default_caching = TTM_PL_FLAG_CACHED;
 
        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 770c8988c1397c447a2ec8e59736629b5c79be7f..c80d9fa022f79b089a842f5572b27e25302da395 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_range_manager.c
+++ b/drivers/gpu/drm/ttm/ttm_range_manager.c
@@ -115,7 +115,6 @@ 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,
-                      uint32_t default_caching,
                       bool use_tt,
                       unsigned long p_size)
 {
@@ -128,7 +127,6 @@ int ttm_range_man_init(struct ttm_bo_device *bdev,
 
        man = &rman->manager;
        man->available_caching = available_caching;
-       man->default_caching = default_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 3a4602f9a03bdce2e1c1263bd468b5f5830004c9..80e10c28f3e843472ad4ae94145dde3f5c5a5968 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_resource.c
+++ b/drivers/gpu/drm/ttm/ttm_resource.c
@@ -141,7 +141,6 @@ void ttm_resource_manager_debug(struct ttm_resource_manager *man,
        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);
-       drm_printf(p, "  default_caching: 0x%08X\n", man->default_caching);
        if (man->func && man->func->debug)
                (*man->func->debug)(man, p);
 }

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index e600128860656ac97fb2bb503c09558ea5690ded..1020c991fd9b9f362b452c424b0a8ab3eed7f530 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -627,8 +627,8 @@ static int vmw_vram_manager_init(struct vmw_private *dev_priv)
        ret = vmw_thp_init(dev_priv);
 #else
        ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM,
-                                TTM_PL_FLAG_CACHED, TTM_PL_FLAG_CACHED,
-                                false, dev_priv->vram_size >> PAGE_SHIFT);
+                                TTM_PL_FLAG_CACHED, false,
+                                dev_priv->vram_size >> PAGE_SHIFT);
 #endif
        ttm_resource_manager_set_used(ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM), false);
        return ret;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
index bb76acb5b0fcf5aa6b82e67cb6f7eebc07e30f5d..2d81a276b301d63a615d6a4328a737b4671a5538 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
@@ -113,7 +113,6 @@ int vmw_gmrid_man_init(struct vmw_private *dev_priv, int type)
 
        man->func = &vmw_gmrid_manager_func;
        man->available_caching = TTM_PL_FLAG_CACHED;
-       man->default_caching = TTM_PL_FLAG_CACHED;
        /* TODO: This is most likely not correct */
        man->use_tt = true;
        ttm_resource_manager_init(man, 0);

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
index 3c00a9e7cfcc8fd849415057a8447fb279885c1e..b6cf5763c93734298939130b1810408857ae5b6d 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
@@ -132,7 +132,6 @@ int vmw_thp_init(struct vmw_private *dev_priv)
 
        man = &rman->manager;
        man->available_caching = TTM_PL_FLAG_CACHED;
-       man->default_caching = TTM_PL_FLAG_CACHED;
 
        ttm_resource_manager_init(man,
                                  dev_priv->vram_size >> PAGE_SHIFT);

diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 303a89d1066d09d980b726da86bae34654b3a473..bf000d69e533947a89845e0953020b82c1c27620 100644 (file)
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -690,7 +690,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
- * @default_caching: default caching mode
  * @use_tt: if the memory manager uses tt
  * @p_size: size of area to be managed in pages.
  *
@@ -700,7 +699,6 @@ pgprot_t ttm_io_prot(uint32_t caching_flags, pgprot_t tmp);
 int ttm_range_man_init(struct ttm_bo_device *bdev,
                       unsigned type,
                       uint32_t available_caching,
-                      uint32_t default_caching,
                       bool use_tt,
                       unsigned long p_size);
 

diff --git a/include/drm/ttm/ttm_resource.h b/include/drm/ttm/ttm_resource.h
index 7b8a3157fbb32c8aff402bcf304d78d2157c066d..a6ae4bf9c3e1d0d4b6a7ecf5a1a4ef9e5e24539e 100644 (file)
--- a/include/drm/ttm/ttm_resource.h
+++ b/include/drm/ttm/ttm_resource.h
@@ -110,8 +110,6 @@ struct ttm_resource_manager_func {
  * @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
- * @default_caching: The default caching policy used for a buffer object
- * placed in this memory type if the user doesn't provide one.
  * @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.
@@ -128,7 +126,6 @@ struct ttm_resource_manager {
        bool use_tt;
        uint64_t size;
        uint32_t available_caching;
-       uint32_t default_caching;
        const struct ttm_resource_manager_func *func;
        spinlock_t move_lock;