Skip to contentSkip to conversation

drm/amdgpu/atomfirmware: fix DDR5 width reporting

PATCH In review Alex Deucher 3 participants 4 messages Jun 7, 2023 – Jun 15, 2023

Subsystems (2)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/1 drm/amdgpu/atomfirmware: fix DDR5 width reporting

DDR5 channels are 32 bit rather than 64, report the width properly in the log.

---
 .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +14 -6
index ef4b9a41f20a..6b3bdc27f778 100644
@@ -327,10 +327,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
 					mem_channel_number = igp_info->v11.umachannelnumber;
 					if (!mem_channel_number)
 						mem_channel_number = 1;
-					/* channel width is 64 */
-					if (vram_width)
-						*vram_width = mem_channel_number * 64;
 					mem_type = igp_info->v11.memorytype;
+					if ((mem_type == Ddr5MemType) ||
+					    (mem_type == LpDdr5MemType))
+						mem_channel_width = 32;
+					else
+						mem_channel_width = 64;
+					if (vram_width)
+						*vram_width = mem_channel_number * mem_channel_width;
 					if (vram_type)
 						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
 					break;
@@ -345,10 +349,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
 					mem_channel_number = igp_info->v21.umachannelnumber;
 					if (!mem_channel_number)
 						mem_channel_number = 1;
-					/* channel width is 64 */
-					if (vram_width)
-						*vram_width = mem_channel_number * 64;
 					mem_type = igp_info->v21.memorytype;
+					if ((mem_type == Ddr5MemType) ||
+					    (mem_type == LpDdr5MemType))
+						mem_channel_width = 32;
+					else
+						mem_channel_width = 64;
+					if (vram_width)
+						*vram_width = mem_channel_number * mem_channel_width;
 					if (vram_type)
 						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
 					break;
Signature · 1 line
2.40.1
#1 lore raw

Ping?

Quoted 53 lines · Alex Deucher

DDR5 channels are 32 bit rather than 64, report the width properly in the log.

---
 .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +14 -7
index ef4b9a41f20a..6b3bdc27f778 100644
@@ -327,10 +327,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
                                        mem_channel_number = igp_info->v11.umachannelnumber;
                                        if (!mem_channel_number)
                                                mem_channel_number = 1;
-                                       /* channel width is 64 */
-                                       if (vram_width)
-                                               *vram_width = mem_channel_number * 64;
                                        mem_type = igp_info->v11.memorytype;
+                                       if ((mem_type == Ddr5MemType) ||
+                                           (mem_type == LpDdr5MemType))
+                                               mem_channel_width = 32;
+                                       else
+                                               mem_channel_width = 64;
+                                       if (vram_width)
+                                               *vram_width = mem_channel_number * mem_channel_width;
                                        if (vram_type)
                                                *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
                                        break;
@@ -345,10 +349,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
                                        mem_channel_number = igp_info->v21.umachannelnumber;
                                        if (!mem_channel_number)
                                                mem_channel_number = 1;
-                                       /* channel width is 64 */
-                                       if (vram_width)
-                                               *vram_width = mem_channel_number * 64;
                                        mem_type = igp_info->v21.memorytype;
+                                       if ((mem_type == Ddr5MemType) ||
+                                           (mem_type == LpDdr5MemType))
+                                               mem_channel_width = 32;
+                                       else
+                                               mem_channel_width = 64;
+                                       if (vram_width)
+                                               *vram_width = mem_channel_number * mem_channel_width;
                                        if (vram_type)
                                                *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
                                        break;
--

2.40.1

#2 lore raw

Ping?

Quoted 57 lines · Alex Deucher

Ping?

Quoted 53 lines · Alex Deucher

DDR5 channels are 32 bit rather than 64, report the width properly in the log.

---
 .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +14 -7
index ef4b9a41f20a..6b3bdc27f778 100644
@@ -327,10 +327,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
                                        mem_channel_number = igp_info->v11.umachannelnumber;
                                        if (!mem_channel_number)
                                                mem_channel_number = 1;
-                                       /* channel width is 64 */
-                                       if (vram_width)
-                                               *vram_width = mem_channel_number * 64;
                                        mem_type = igp_info->v11.memorytype;
+                                       if ((mem_type == Ddr5MemType) ||
+                                           (mem_type == LpDdr5MemType))
+                                               mem_channel_width = 32;
+                                       else
+                                               mem_channel_width = 64;
+                                       if (vram_width)
+                                               *vram_width = mem_channel_number * mem_channel_width;
                                        if (vram_type)
                                                *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
                                        break;
@@ -345,10 +349,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
                                        mem_channel_number = igp_info->v21.umachannelnumber;
                                        if (!mem_channel_number)
                                                mem_channel_number = 1;
-                                       /* channel width is 64 */
-                                       if (vram_width)
-                                               *vram_width = mem_channel_number * 64;
                                        mem_type = igp_info->v21.memorytype;
+                                       if ((mem_type == Ddr5MemType) ||
+                                           (mem_type == LpDdr5MemType))
+                                               mem_channel_width = 32;
+                                       else
+                                               mem_channel_width = 64;
+                                       if (vram_width)
+                                               *vram_width = mem_channel_number * mem_channel_width;
                                        if (vram_type)
                                                *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
                                        break;
--

2.40.1

#3 lore raw

[AMD Official Use Only - General]

Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Thursday, June 15, 2023 21:18
To: Deucher, Alexander <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH] drm/amdgpu/atomfirmware: fix DDR5 width reporting

Ping?

Quoted 63 lines · Alex Deucher

Ping?

Quoted 59 lines · Alex Deucher

DDR5 channels are 32 bit rather than 64, report the width properly in the log.

---
 .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c  | 20
+++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +8 -3
index ef4b9a41f20a..6b3bdc27f778 100644
@@ -327,10 +327,14 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,
                                        mem_channel_number = igp_info->v11.umachannelnumber;
                                        if (!mem_channel_number)
                                                mem_channel_number = 1;
-                                       /* channel width is 64 */
-                                       if (vram_width)
-                                               *vram_width = mem_channel_number * 64;
                                        mem_type =
 igp_info->v11.memorytype;
+                                       if ((mem_type == Ddr5MemType) ||
+                                           (mem_type == LpDdr5MemType))
+                                               mem_channel_width = 32;
+                                       else
+                                               mem_channel_width = 64;
+                                       if (vram_width)
+                                               *vram_width =
+ mem_channel_number * mem_channel_width;
                                        if (vram_type)
                                                *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
                                        break; @@ -345,10 +349,14 @@

amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev,

                                        mem_channel_number = igp_info->v21.umachannelnumber;
                                        if (!mem_channel_number)
                                                mem_channel_number = 1;
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +0 -3
-                                       /* channel width is 64 */
-                                       if (vram_width)
-                                               *vram_width = mem_channel_number * 64;
                                        mem_type =

igp_info->v21.memorytype;

drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +8 -1
+                                       if ((mem_type == Ddr5MemType) ||
+                                           (mem_type == LpDdr5MemType))
+                                               mem_channel_width = 32;
+                                       else
+                                               mem_channel_width = 64;
+                                       if (vram_width)
+                                               *vram_width =
+ mem_channel_number * mem_channel_width;
                                        if (vram_type)
                                                *vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);
                                        break;
--

2.40.1