drm/amdgpu: remove AMDGPU_GEM_CREATE_CPU_GTT_UC

This flag isn't used by user mode drivers, remove it to avoid
confusion. And rename GTT_WC to GTT_USWC to make it clear.

Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index f5e17f95e812050f758743d2cd0a1d56cdd00f3a..992b7f5843bc7c717f40924e21c66997dec0275e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -132,10 +132,7 @@ void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *rbo, u32 domain)
        }
 
        if (domain & AMDGPU_GEM_DOMAIN_GTT) {
-               if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_UC) {
-                       rbo->placements[c].fpfn = 0;
-                       rbo->placements[c++].flags = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_TT;
-               } else if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_WC) {
+               if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) {
                        rbo->placements[c].fpfn = 0;
                        rbo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT |
                                                                                 TTM_PL_FLAG_UNCACHED;
@@ -146,10 +143,7 @@ void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *rbo, u32 domain)
        }
 
        if (domain & AMDGPU_GEM_DOMAIN_CPU) {
-               if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_UC) {
-                       rbo->placements[c].fpfn = 0;
-                       rbo->placements[c++].flags =  TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_SYSTEM;
-               } else if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_WC) {
+               if (rbo->flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) {
                        rbo->placements[c].fpfn = 0;
                        rbo->placements[c++].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_SYSTEM |
                                                                                 TTM_PL_FLAG_UNCACHED;

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 9e771fb858b4921e2d376befd95ba99389ddf2e5..77bc5740fd7cbd86c904a76013c83c61a5fd198a 100644 (file)
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -73,15 +73,12 @@
 #define AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED  (1 << 0)
 /* Flag that CPU access will not work, this VRAM domain is invisible */
 #define AMDGPU_GEM_CREATE_NO_CPU_ACCESS                (1 << 1)
-/* Flag that un-cached attributes should be used for GTT */
-#define AMDGPU_GEM_CREATE_CPU_GTT_UC           (1 << 2)
 /* Flag that USWC attributes should be used for GTT */
-#define AMDGPU_GEM_CREATE_CPU_GTT_WC           (1 << 3)
+#define AMDGPU_GEM_CREATE_CPU_GTT_USWC         (1 << 2)
 
 /* Flag mask for GTT domain_flags */
 #define AMDGPU_GEM_CREATE_CPU_GTT_MASK \
-       (AMDGPU_GEM_CREATE_CPU_GTT_WC | \
-        AMDGPU_GEM_CREATE_CPU_GTT_UC | \
+       (AMDGPU_GEM_CREATE_CPU_GTT_USWC | \
         AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | \
         AMDGPU_GEM_CREATE_NO_CPU_ACCESS)