]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amdgpu: select HDP ref/mask according to gfx ring pipe
authorZhenGuo Yin <zhenguo.yin@amd.com>
Fri, 29 Mar 2024 07:41:58 +0000 (15:41 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 10 Apr 2024 01:59:44 +0000 (21:59 -0400)
Use correct ref/mask for differnent gfx ring pipe.
This should fix the gfx hang issue after enabling gfx pipe1.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2117
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: ZhenGuo Yin <zhenguo.yin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

index d524f1a353ed91ec8e4b0d61f837bfb188aad6da..a01320e72653e98f441ca6af72e5ca4b9c0e9f0c 100644 (file)
@@ -8317,7 +8317,7 @@ static void gfx_v10_0_ring_emit_hdp_flush(struct amdgpu_ring *ring)
                }
                reg_mem_engine = 0;
        } else {
-               ref_and_mask = nbio_hf_reg->ref_and_mask_cp0;
+               ref_and_mask = nbio_hf_reg->ref_and_mask_cp0 << ring->pipe;
                reg_mem_engine = 1; /* pfp */
        }