Skip to contentSkip to conversation

drm/amdgpu: allow multipipe policy on ASICs with one MEC

PATCH In review Lang Yu 3 participants 4 messages Jan 16, 2023 – Jan 17, 2023

Subsystems (2)
lore
Share & tools
lore

Lang Yu

author
#0 lore raw

PATCH 1/2 drm/amdgpu: allow multipipe policy on ASICs with one MEC

Always enable multipipe policy on ASICs with GC VERSION > 9.0.0 instead of MEC number > 1.

This will allow multipipe policy on ASICs with one MEC, e.g., gfx11 APUs.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +3 -0
index 42a939cd2eac..dfd8a0ccbc83 100644
@@ -156,6 +156,9 @@ static bool amdgpu_gfx_is_compute_multipipe_capable(struct amdgpu_device *adev)
 		return amdgpu_compute_multipipe == 1;
 	}
 
+	if (adev->ip_versions[GC_HWIP][0] > IP_VERSION(9, 0, 0))
+		return true;
+
 	/* FIXME: spreading the queues across pipes causes perf regressions
 	 * on POLARIS11 compute workloads */
 	if (adev->asic_type == CHIP_POLARIS11)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/2 drm/amdgpu: correct MEC number for gfx11 APUs

There is only one MEC on these APUs.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +9 -2
index 985fe704203e..dd4e0f337f46 100644
@@ -1251,10 +1251,8 @@ static int gfx_v11_0_sw_init(void *handle)
 
 	switch (adev->ip_versions[GC_HWIP][0]) {
 	case IP_VERSION(11, 0, 0):
-	case IP_VERSION(11, 0, 1):
 	case IP_VERSION(11, 0, 2):
 	case IP_VERSION(11, 0, 3):
-	case IP_VERSION(11, 0, 4):
 		adev->gfx.me.num_me = 1;
 		adev->gfx.me.num_pipe_per_me = 1;
 		adev->gfx.me.num_queue_per_pipe = 1;
@@ -1262,6 +1260,15 @@ static int gfx_v11_0_sw_init(void *handle)
 		adev->gfx.mec.num_pipe_per_mec = 4;
 		adev->gfx.mec.num_queue_per_pipe = 4;
 		break;
+	case IP_VERSION(11, 0, 1):
+	case IP_VERSION(11, 0, 4):
+		adev->gfx.me.num_me = 1;
+		adev->gfx.me.num_pipe_per_me = 1;
+		adev->gfx.me.num_queue_per_pipe = 1;
+		adev->gfx.mec.num_mec = 1;
+		adev->gfx.mec.num_pipe_per_mec = 4;
+		adev->gfx.mec.num_queue_per_pipe = 4;
+		break;
 	default:
 		adev->gfx.me.num_me = 1;
 		adev->gfx.me.num_pipe_per_me = 1;
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#2 lore raw

RE: [PATCH 2/2] drm/amdgpu: correct MEC number for gfx11 APUs

[Public]

This series is:

Best Regards,
Yifan

-----Original Message-----
From: Yu, Lang <[email protected]>
Sent: Monday, January 16, 2023 4:20 PM
To: [email protected]
Cc: Koenig, Christian <[email protected]>; Du, Xiaojian <[email protected]>; Zhang, Yifan <[email protected]>; Yu, Lang <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: correct MEC number for gfx11 APUs

There is only one MEC on these APUs.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +9 -2
index 985fe704203e..dd4e0f337f46 100644
@@ -1251,10 +1251,8 @@ static int gfx_v11_0_sw_init(void *handle)
 
 	switch (adev->ip_versions[GC_HWIP][0]) {
 	case IP_VERSION(11, 0, 0):
-	case IP_VERSION(11, 0, 1):
 	case IP_VERSION(11, 0, 2):
 	case IP_VERSION(11, 0, 3):
-	case IP_VERSION(11, 0, 4):
 		adev->gfx.me.num_me = 1;
 		adev->gfx.me.num_pipe_per_me = 1;
 		adev->gfx.me.num_queue_per_pipe = 1;
@@ -1262,6 +1260,15 @@ static int gfx_v11_0_sw_init(void *handle)
 		adev->gfx.mec.num_pipe_per_mec = 4;
 		adev->gfx.mec.num_queue_per_pipe = 4;
 		break;
+	case IP_VERSION(11, 0, 1):
+	case IP_VERSION(11, 0, 4):
+		adev->gfx.me.num_me = 1;
+		adev->gfx.me.num_pipe_per_me = 1;
+		adev->gfx.me.num_queue_per_pipe = 1;
+		adev->gfx.mec.num_mec = 1;
+		adev->gfx.mec.num_pipe_per_mec = 4;
+		adev->gfx.mec.num_queue_per_pipe = 4;
+		break;
 	default:
 		adev->gfx.me.num_me = 1;
 		adev->gfx.me.num_pipe_per_me = 1;
Signature · 1 line
2.25.1
Reviewed-by on v1 2/2
#3 lore raw

RE: [PATCH 2/2] drm/amdgpu: correct MEC number for gfx11 APUs

In reply to Lang Yu

[AMD Official Use Only - General]

The series is

Quoted 50 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Lang Yu
Sent: Monday, January 16, 2023 4:20 PM
To: [email protected]
Cc: Zhang, Yifan <[email protected]>; Yu, Lang <[email protected]>; Koenig, Christian <[email protected]>; Du, Xiaojian <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: correct MEC number for gfx11 APUs

There is only one MEC on these APUs.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +9 -3
index 985fe704203e..dd4e0f337f46 100644
@@ -1251,10 +1251,8 @@ static int gfx_v11_0_sw_init(void *handle)
 
      switch (adev->ip_versions[GC_HWIP][0]) {
      case IP_VERSION(11, 0, 0):
-     case IP_VERSION(11, 0, 1):
      case IP_VERSION(11, 0, 2):
      case IP_VERSION(11, 0, 3):
-     case IP_VERSION(11, 0, 4):
              adev->gfx.me.num_me = 1;
              adev->gfx.me.num_pipe_per_me = 1;
              adev->gfx.me.num_queue_per_pipe = 1;
@@ -1262,6 +1260,15 @@ static int gfx_v11_0_sw_init(void *handle)
              adev->gfx.mec.num_pipe_per_mec = 4;
              adev->gfx.mec.num_queue_per_pipe = 4;
              break;
+     case IP_VERSION(11, 0, 1):
+     case IP_VERSION(11, 0, 4):
+             adev->gfx.me.num_me = 1;
+             adev->gfx.me.num_pipe_per_me = 1;
+             adev->gfx.me.num_queue_per_pipe = 1;
+             adev->gfx.mec.num_mec = 1;
+             adev->gfx.mec.num_pipe_per_mec = 4;
+             adev->gfx.mec.num_queue_per_pipe = 4;
+             break;
      default:
              adev->gfx.me.num_me = 1;
              adev->gfx.me.num_pipe_per_me = 1;
--

2.25.1