]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: use linux size macro to simplify ONE_Kib & One_Mib
authorKevin Wang <kevin1.wang@amd.com>
Thu, 2 Jan 2020 05:59:17 +0000 (13:59 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 7 Jan 2020 16:58:44 +0000 (11:58 -0500)
replace internal size macro with linux size macro

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Tianci Yin <tianci.yin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h

index b2f8ba9e1f774b553ab7c3597fc88f2b4c54845d..3114d8a47e884ad528faceee4aabd2fb9a2d84ac 100644 (file)
@@ -1719,10 +1719,10 @@ static int amdgpu_ttm_training_reserve_vram_fini(struct amdgpu_device *adev)
 
 static u64 amdgpu_ttm_training_get_c2p_offset(u64 vram_size)
 {
-       if ((vram_size & (ONE_MiB - 1)) < (4 * ONE_KiB + 1) )
-               vram_size -= ONE_MiB;
+       if ((vram_size & (SZ_1M - 1)) < (SZ_4K + 1) )
+               vram_size -= SZ_1M;
 
-       return ALIGN(vram_size, ONE_MiB);
+       return ALIGN(vram_size, SZ_1M);
 }
 
 /**
index e8715287af046b1a8f0936557b3893e67e17ca7a..0dddedc06ae34b0dcd190312d25aed9cf5ebf405 100644 (file)
@@ -66,13 +66,6 @@ struct amdgpu_copy_mem {
        unsigned long                   offset;
 };
 
-/* Definitions for constance */
-enum amdgpu_internal_constants
-{
-       ONE_KiB = 0x400,
-       ONE_MiB = 0x100000,
-};
-
 extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
 extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;