lkml.org 
[lkml]   [2022]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 18/48] drm/amdgpu/mes: zero the sdma_hqd_mask of 2nd SDMA engine for SDMA 6.0.1
    Date
    From: Yifan Zhang <yifan1.zhang@amd.com>

    [ Upstream commit 0af4ed0c329ebb4cef95fda4fcdbfcdea0255442 ]

    there is only one SDMA engine in SDMA 6.0.1, the sdma_hqd_mask has to be
    zeroed for the 2nd engine, otherwise MES scheduler will consider 2nd
    engine exists and map/unmap SDMA queues to the non-existent engine.

    Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
    Reviewed-by: Tim Huang <Tim.Huang@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
    index 69a70a0aaed9..6ab062c63da1 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
    @@ -169,6 +169,9 @@ int amdgpu_mes_init(struct amdgpu_device *adev)
    for (i = 0; i < AMDGPU_MES_MAX_SDMA_PIPES; i++) {
    if (adev->ip_versions[SDMA0_HWIP][0] < IP_VERSION(6, 0, 0))
    adev->mes.sdma_hqd_mask[i] = i ? 0 : 0x3fc;
    + /* zero sdma_hqd_mask for non-existent engine */
    + else if (adev->sdma.num_instances == 1)
    + adev->mes.sdma_hqd_mask[i] = i ? 0 : 0xfc;
    else
    adev->mes.sdma_hqd_mask[i] = 0xfc;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-10 09:10    [W:4.060 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site