* [PATCH V2] drm/amdgpu/gfx11: don't enable gfx on pipe1 with tmz
@ 2026-11-19 19:12 Alex Deucher
2026-11-19 19:33 ` sashiko-bot
0 siblings, 1 reply; 2+ messages in thread
From: Alex Deucher @ 2026-11-19 19:12 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
FW doesn't support tmz on pipe one. Only use pipe 0 if
tmz is enabled.
v2: add check for num_pipe as well
Fixes: fec62b5e1425 ("drm/amdgpu/gfx11: enable gfx pipe1 hardware support")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 570f0f3a2ea5e..16b211174c8dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -1690,7 +1690,8 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
case IP_VERSION(11, 7, 0):
case IP_VERSION(11, 7, 1):
adev->gfx.me.num_me = 1;
- if (adev->gfx.rs64_enable)
+ if (adev->gfx.rs64_enable ||
+ adev->gmc.tmz_enabled)
adev->gfx.me.num_pipe_per_me = 1;
else
adev->gfx.me.num_pipe_per_me = 2;
@@ -5322,10 +5323,15 @@ static int gfx_v11_0_early_init(struct amdgpu_ip_block *ip_block)
adev->gfx.num_compute_rings = 0;
} else {
/* rs64 only supports one gfx pipe */
- if (adev->gfx.rs64_enable)
+ if (adev->gfx.rs64_enable) {
adev->gfx.num_gfx_rings = 1;
- else
- adev->gfx.num_gfx_rings = GFX11_NUM_GFX_RINGS;
+ } else {
+ /* FW doesn't support TMZ on gfx pipe1 */
+ if (adev->gmc.tmz_enabled)
+ adev->gfx.num_gfx_rings = 1;
+ else
+ adev->gfx.num_gfx_rings = GFX11_NUM_GFX_RINGS;
+ }
adev->gfx.num_compute_rings = min(amdgpu_gfx_get_num_kcq(adev),
AMDGPU_MAX_COMPUTE_RINGS);
}
--
2.56.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH V2] drm/amdgpu/gfx11: don't enable gfx on pipe1 with tmz
2026-11-19 19:12 [PATCH V2] drm/amdgpu/gfx11: don't enable gfx on pipe1 with tmz Alex Deucher
@ 2026-11-19 19:33 ` sashiko-bot
0 siblings, 0 replies; 2+ messages in thread
From: sashiko-bot @ 2026-11-19 19:33 UTC (permalink / raw)
To: Alex Deucher, amd-gfx
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Low] drm/amdgpu/gfx11: dead tmz_enabled check in
gfx_v11_0_early_init()
--
commit 7adeab4007af8d1d45d18ee604343d9e2fa08024
Author: Alex Deucher <alexander.deucher@amd.com>
drm/amdgpu/gfx11: don't enable gfx on pipe1 with tmz
This commit restricts GFX11 to a single GFX pipe and ring when TMZ is
enabled, because the firmware does not support TMZ on pipe 1.
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 5d068a9d9c72c..d4ea4769efa0b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
[ ... ]
> @@ -5302,10 +5303,15 @@ static int gfx_v11_0_early_init(struct amdgpu_ip_block *ip_block)
> adev->gfx.num_compute_rings = 0;
> } else {
> /* rs64 only supports one gfx pipe */
> - if (adev->gfx.rs64_enable)
> + if (adev->gfx.rs64_enable) {
> adev->gfx.num_gfx_rings = 1;
> - else
> - adev->gfx.num_gfx_rings = GFX11_NUM_GFX_RINGS;
> + } else {
> + /* FW doesn't support TMZ on gfx pipe1 */
> + if (adev->gmc.tmz_enabled)
> + adev->gfx.num_gfx_rings = 1;
> + else
> + adev->gfx.num_gfx_rings = GFX11_NUM_GFX_RINGS;
> + }
> adev->gfx.num_compute_rings = min(amdgpu_gfx_get_num_kcq(adev),
> AMDGPU_MAX_COMPUTE_RINGS);
> }
[Severity: Low]
Can adev->gmc.tmz_enabled ever be true in gfx_v11_0_early_init()?
In amdgpu_device_init(), amdgpu_device_ip_early_init() runs before
amdgpu_gmc_tmz_set() initializes adev->gmc.tmz_enabled:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:amdgpu_device_init() {
...
/* early init functions */
r = amdgpu_device_ip_early_init(adev);
if (r)
return r;
...
/* Enable TMZ based on IP_VERSION */
amdgpu_gmc_tmz_set(adev);
...
}
Because adev->gmc.tmz_enabled is still false here,
gfx_v11_0_early_init() always sets adev->gfx.num_gfx_rings to
GFX11_NUM_GFX_RINGS and gfx_v11_0_set_ring_funcs() populates
gfx_ring[1].funcs before gfx_v11_0_sw_init() later clamps
num_pipe_per_me and num_gfx_rings back to 1.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261119191202.190939-1-alexander.deucher@amd.com?part=1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-19 19:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 19:12 [PATCH V2] drm/amdgpu/gfx11: don't enable gfx on pipe1 with tmz Alex Deucher
2026-11-19 19:33 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox