drm/ttm: rework handling of private mem types

Instead of keeping a bunch of potentially unused flags, just define
the start for private memory types and remove the rest.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

4 files changed, 20 insertions, 20 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index 214bae965fc6..3ee825f4de28 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -26,13 +26,13 @@
 
 #include "gpu_scheduler.h"
 
-#define AMDGPU_PL_GDS           TTM_PL_PRIV0
-#define AMDGPU_PL_GWS           TTM_PL_PRIV1
-#define AMDGPU_PL_OA            TTM_PL_PRIV2
+#define AMDGPU_PL_GDS           (TTM_PL_PRIV + 0)
+#define AMDGPU_PL_GWS           (TTM_PL_PRIV + 1)
+#define AMDGPU_PL_OA            (TTM_PL_PRIV + 2)
 
-#define AMDGPU_PL_FLAG_GDS              TTM_PL_FLAG_PRIV0
-#define AMDGPU_PL_FLAG_GWS              TTM_PL_FLAG_PRIV1
-#define AMDGPU_PL_FLAG_OA               TTM_PL_FLAG_PRIV2
+#define AMDGPU_PL_FLAG_GDS              (TTM_PL_FLAG_PRIV << 0)
+#define AMDGPU_PL_FLAG_GWS              (TTM_PL_FLAG_PRIV << 1)
+#define AMDGPU_PL_FLAG_OA               (TTM_PL_FLAG_PRIV << 2)
 
 #define AMDGPU_TTM_LRU_SIZE     20
 
diff --git a/drivers/gpu/drm/qxl/qxl_object.c b/drivers/gpu/drm/qxl/qxl_object.c
index 5e1d7899dd72..fa5440dc9a19 100644
--- a/drivers/gpu/drm/qxl/qxl_object.c
+++ b/drivers/gpu/drm/qxl/qxl_object.c
@@ -61,7 +61,7 @@ void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain, bool pinned)
         if (domain == QXL_GEM_DOMAIN_VRAM)
                 qbo->placements[c++].flags = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_VRAM | pflag;
         if (domain == QXL_GEM_DOMAIN_SURFACE)
-                qbo->placements[c++].flags = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_PRIV0 | pflag;
+                qbo->placements[c++].flags = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_PRIV | pflag;
         if (domain == QXL_GEM_DOMAIN_CPU)
                 qbo->placements[c++].flags = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM | pflag;
         if (!c)
@@ -151,7 +151,7 @@ void *qxl_bo_kmap_atomic_page(struct qxl_device *qdev,
 
         if (bo->tbo.mem.mem_type == TTM_PL_VRAM)
                 map = qdev->vram_mapping;
-        else if (bo->tbo.mem.mem_type == TTM_PL_PRIV0)
+        else if (bo->tbo.mem.mem_type == TTM_PL_PRIV)
                 map = qdev->surface_mapping;
         else
                 goto fallback;
@@ -191,7 +191,7 @@ void qxl_bo_kunmap_atomic_page(struct qxl_device *qdev,
 
         if (bo->tbo.mem.mem_type == TTM_PL_VRAM)
                 map = qdev->vram_mapping;
-        else if (bo->tbo.mem.mem_type == TTM_PL_PRIV0)
+        else if (bo->tbo.mem.mem_type == TTM_PL_PRIV)
                 map = qdev->surface_mapping;
         else
                 goto fallback;
@@ -311,7 +311,7 @@ int qxl_bo_check_id(struct qxl_device *qdev, struct qxl_bo *bo)
 
 int qxl_surf_evict(struct qxl_device *qdev)
 {
-        return ttm_bo_evict_mm(&qdev->mman.bdev, TTM_PL_PRIV0);
+        return ttm_bo_evict_mm(&qdev->mman.bdev, TTM_PL_PRIV);
 }
 
 int qxl_vram_evict(struct qxl_device *qdev)
diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 6a22de045cb5..a257ad26beef 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -168,7 +168,7 @@ static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
                 man->default_caching = TTM_PL_FLAG_CACHED;
                 break;
         case TTM_PL_VRAM:
-        case TTM_PL_PRIV0:
+        case TTM_PL_PRIV:
                 /* "On-card" video ram */
                 man->func = &ttm_bo_manager_func;
                 man->gpu_offset = 0;
@@ -235,7 +235,7 @@ static int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
                 mem->bus.base = qdev->vram_base;
                 mem->bus.offset = mem->start << PAGE_SHIFT;
                 break;
-        case TTM_PL_PRIV0:
+        case TTM_PL_PRIV:
                 mem->bus.is_iomem = true;
                 mem->bus.base = qdev->surfaceram_base;
                 mem->bus.offset = mem->start << PAGE_SHIFT;
@@ -376,7 +376,7 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo,
         qbo = to_qxl_bo(bo);
         qdev = qbo->gem_base.dev->dev_private;
 
-        if (bo->mem.mem_type == TTM_PL_PRIV0 && qbo->surface_id)
+        if (bo->mem.mem_type == TTM_PL_PRIV && qbo->surface_id)
                 qxl_surface_evict(qdev, qbo, new_mem ? true : false);
 }
 
@@ -422,7 +422,7 @@ int qxl_ttm_init(struct qxl_device *qdev)
                 DRM_ERROR("Failed initializing VRAM heap.\n");
                 return r;
         }
-        r = ttm_bo_init_mm(&qdev->mman.bdev, TTM_PL_PRIV0,
+        r = ttm_bo_init_mm(&qdev->mman.bdev, TTM_PL_PRIV,
                            qdev->surfaceram_size / PAGE_SIZE);
         if (r) {
                 DRM_ERROR("Failed initializing Surfaces heap.\n");
@@ -445,7 +445,7 @@ int qxl_ttm_init(struct qxl_device *qdev)
 void qxl_ttm_fini(struct qxl_device *qdev)
 {
         ttm_bo_clean_mm(&qdev->mman.bdev, TTM_PL_VRAM);
-        ttm_bo_clean_mm(&qdev->mman.bdev, TTM_PL_PRIV0);
+        ttm_bo_clean_mm(&qdev->mman.bdev, TTM_PL_PRIV);
         ttm_bo_device_release(&qdev->mman.bdev);
         qxl_ttm_global_fini(qdev);
         DRM_INFO("qxl: ttm finalized\n");
@@ -489,7 +489,7 @@ static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
                 if (i == 0)
                         qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
                 else
-                        qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
+                        qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV].priv;
 
         }
         return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 74304b03f9d4..070d750af16d 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -67,10 +67,10 @@
                         VMWGFX_NUM_GB_SURFACE +\
                         VMWGFX_NUM_GB_SCREEN_TARGET)
 
-#define VMW_PL_GMR TTM_PL_PRIV0
-#define VMW_PL_FLAG_GMR TTM_PL_FLAG_PRIV0
-#define VMW_PL_MOB TTM_PL_PRIV1
-#define VMW_PL_FLAG_MOB TTM_PL_FLAG_PRIV1
+#define VMW_PL_GMR (TTM_PL_PRIV + 0)
+#define VMW_PL_FLAG_GMR (TTM_PL_FLAG_PRIV << 0)
+#define VMW_PL_MOB (TTM_PL_PRIV + 1)
+#define VMW_PL_FLAG_MOB (TTM_PL_FLAG_PRIV << 1)
 
 #define VMW_RES_CONTEXT ttm_driver_type0
 #define VMW_RES_SURFACE ttm_driver_type1