diff --git a/include/drm-uapi/amdgpu_drm.h b/include/drm-uapi/amdgpu_drm.h index e595e83ef57..e0859e23a36 100644 --- a/include/drm-uapi/amdgpu_drm.h +++ b/include/drm-uapi/amdgpu_drm.h @@ -1365,6 +1365,8 @@ struct drm_amdgpu_info_vbios { #define AMDGPU_VRAM_TYPE_DDR5 10 #define AMDGPU_VRAM_TYPE_LPDDR4 11 #define AMDGPU_VRAM_TYPE_LPDDR5 12 +#define AMDGPU_VRAM_TYPE_HBM3E 13 +#define AMDGPU_VRAM_TYPE_HBM4 14 struct drm_amdgpu_info_device { /** PCI Device ID */ diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index ec9f0ee8e8c..e113d583ab7 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -2449,11 +2449,7 @@ void ac_get_task_info(const struct radeon_info *info, uint32_t ac_memory_ops_per_clock(uint32_t vram_type) { - /* Based on MemoryOpsPerClockTable from PAL. */ switch (vram_type) { - case AMDGPU_VRAM_TYPE_GDDR1: - case AMDGPU_VRAM_TYPE_GDDR3: /* last in low-end Evergreen */ - case AMDGPU_VRAM_TYPE_GDDR4: /* last in R7xx, not used much */ case AMDGPU_VRAM_TYPE_UNKNOWN: default: return 0; @@ -2461,7 +2457,12 @@ uint32_t ac_memory_ops_per_clock(uint32_t vram_type) case AMDGPU_VRAM_TYPE_DDR3: case AMDGPU_VRAM_TYPE_DDR4: case AMDGPU_VRAM_TYPE_LPDDR4: + case AMDGPU_VRAM_TYPE_GDDR1: + case AMDGPU_VRAM_TYPE_GDDR3: /* last in low-end Evergreen */ + case AMDGPU_VRAM_TYPE_GDDR4: /* last in R7xx, not used much */ case AMDGPU_VRAM_TYPE_HBM: /* same for HBM2 and HBM3 */ + case AMDGPU_VRAM_TYPE_HBM3E: + case AMDGPU_VRAM_TYPE_HBM4: /* higher throughput is due to a wider bus */ return 2; case AMDGPU_VRAM_TYPE_DDR5: case AMDGPU_VRAM_TYPE_LPDDR5: diff --git a/src/amd/common/ac_linux_drm.h b/src/amd/common/ac_linux_drm.h index 6329f08d17b..599244144c1 100644 --- a/src/amd/common/ac_linux_drm.h +++ b/src/amd/common/ac_linux_drm.h @@ -60,6 +60,8 @@ #define AMDGPU_VRAM_TYPE_DDR5 10 #define AMDGPU_VRAM_TYPE_LPDDR4 11 #define AMDGPU_VRAM_TYPE_LPDDR5 12 +#define AMDGPU_VRAM_TYPE_HBM3E 13 +#define AMDGPU_VRAM_TYPE_HBM4 14 #define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2 0 #define AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4 1 diff --git a/src/amd/common/amd_family.h b/src/amd/common/amd_family.h index e3b585b388f..5221b04c96d 100644 --- a/src/amd/common/amd_family.h +++ b/src/amd/common/amd_family.h @@ -186,6 +186,8 @@ enum amd_vram_type { AMD_VRAM_TYPE_DDR5, AMD_VRAM_TYPE_LPDDR4, AMD_VRAM_TYPE_LPDDR5, + AMD_VRAM_TYPE_HBM3E, + AMD_VRAM_TYPE_HBM4, }; enum vcn_version{