diff options
| author | Hawking Zhang <Hawking.Zhang@amd.com> | 2025-06-13 19:58:49 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2025-06-24 10:04:06 -0400 |
| commit | 97c894758b9f1d7a01794d85b95a7b2854d85009 (patch) | |
| tree | f501e4d205845a9b36375cc243bb0142480cea65 | |
| parent | f268cef77e867f6cc4a80fc72bf7476d36325a3e (diff) | |
drm/amdgpu: Move MAX_MEM_RANGES to amdgpu_gmc.h
This relocation allows MAX_MEM_RANGES to be shared
across multiple products
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h index 46b2bcbd5025..5aa404390d68 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h @@ -84,6 +84,8 @@ enum amdgpu_memory_partition { #define AMDGPU_GMC_INIT_RESET_NPS BIT(0) +#define AMDGPU_MAX_MEM_RANGES 8 + /* * GMC page fault information */ diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index e691cc61ef6e..01b9374134f2 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -78,8 +78,6 @@ #define mmHUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_DCN2 0x05ea #define mmHUBP0_DCSURF_PRI_VIEWPORT_DIMENSION_DCN2_BASE_IDX 2 -#define MAX_MEM_RANGES 8 - static const char * const gfxhub_client_ids[] = { "CB", "DB", @@ -1934,7 +1932,7 @@ gmc_v9_0_init_acpi_mem_ranges(struct amdgpu_device *adev, struct amdgpu_mem_partition_info *mem_ranges) { struct amdgpu_numa_info numa_info; - int node_ids[MAX_MEM_RANGES]; + int node_ids[AMDGPU_MAX_MEM_RANGES]; int num_ranges = 0, ret; int num_xcc, xcc_id; uint32_t xcc_mask; @@ -2042,7 +2040,7 @@ static int gmc_v9_0_init_mem_ranges(struct amdgpu_device *adev) { bool valid; - adev->gmc.mem_partitions = kcalloc(MAX_MEM_RANGES, + adev->gmc.mem_partitions = kcalloc(AMDGPU_MAX_MEM_RANGES, sizeof(struct amdgpu_mem_partition_info), GFP_KERNEL); if (!adev->gmc.mem_partitions) |