[PATCH 1/6] drm/amd: add definitions for new memory type

[Tao Zhou]

Support new versions of HBM and GDDR.

Signed-off-by: Tao Zhou <tao.zhou1 at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 12 ++++++++++++
 drivers/gpu/drm/amd/include/atomfirmware.h       |  4 ++++
 include/uapi/drm/amdgpu_drm.h                    |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
index eb015bdda8a7..32fb264849bc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
@@ -281,6 +281,18 @@ static int convert_atom_mem_type_to_vram_type(struct amdgpu_device *adev,
 		case ATOM_DGPU_VRAM_TYPE_GDDR6:
 			vram_type = AMDGPU_VRAM_TYPE_GDDR6;
 			break;
+		case ATOM_DGPU_VRAM_TYPE_HBM3E:
+			vram_type = AMDGPU_VRAM_TYPE_HBM3E;
+			break;
+		case ATOM_DGPU_VRAM_TYPE_HBM4:
+			vram_type = AMDGPU_VRAM_TYPE_HBM4;
+			break;
+		case ATOM_DGPU_VRAM_TYPE_HBM4E:
+			vram_type = AMDGPU_VRAM_TYPE_HBM4E;
+			break;
+		case ATOM_DGPU_VRAM_TYPE_GDDR7:
+			vram_type = AMDGPU_VRAM_TYPE_GDDR7;
+			break;
 		default:
 			vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
 			break;
diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h
index 0160d65f3f5e..8eb8dafb3ac9 100644
--- a/drivers/gpu/drm/amd/include/atomfirmware.h
+++ b/drivers/gpu/drm/amd/include/atomfirmware.h
@@ -183,6 +183,10 @@ enum atom_dgpu_vram_type {
   ATOM_DGPU_VRAM_TYPE_HBM2E = 0x61,
   ATOM_DGPU_VRAM_TYPE_GDDR6 = 0x70,
   ATOM_DGPU_VRAM_TYPE_HBM3 = 0x80,
+  ATOM_DGPU_VRAM_TYPE_HBM3E = 0x81,
+  ATOM_DGPU_VRAM_TYPE_HBM4 = 0x82,
+  ATOM_DGPU_VRAM_TYPE_HBM4E = 0x83,
+  ATOM_DGPU_VRAM_TYPE_GDDR7 = 0x90,
 };
 
 enum atom_dp_vs_preemph_def{
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index a1c8eded0744..d8b5e1d33cd1 100644
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -1423,6 +1423,10 @@ 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
+#define AMDGPU_VRAM_TYPE_HBM4E 15
+#define AMDGPU_VRAM_TYPE_GDDR7 16
 
 #define AMDGPU_VRAM_TYPE_HBM_WIDTH 4096
 
-- 
2.34.1