lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 113/434] drm/amdkfd: Fix MQD size calculation
    Date
    From: Oak Zeng <Oak.Zeng@amd.com>

    [ Upstream commit 40a9592a26608e16f7545a068ea4165e1869f629 ]

    On device initialization, a chunk of GTT memory is pre-allocated for
    HIQ and all SDMA queues mqd. The size of this allocation was wrong.
    The correct sdma engine number should be PCIe-optimized SDMA engine
    number plus xgmi SDMA engine number.

    Reported-by: Jonathan Kim <Jonathan.Kim@amd.com>
    Signed-off-by: Jonathan Kim <Jonathan.Kim@amd.com>
    Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
    Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
    index d985e31fcc1e..f335f73919d1 100644
    --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
    +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
    @@ -1676,7 +1676,8 @@ static int allocate_hiq_sdma_mqd(struct device_queue_manager *dqm)
    struct kfd_dev *dev = dqm->dev;
    struct kfd_mem_obj *mem_obj = &dqm->hiq_sdma_mqd;
    uint32_t size = dqm->mqd_mgrs[KFD_MQD_TYPE_SDMA]->mqd_size *
    - dev->device_info->num_sdma_engines *
    + (dev->device_info->num_sdma_engines +
    + dev->device_info->num_xgmi_sdma_engines) *
    dev->device_info->num_sdma_queues_per_engine +
    dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]->mqd_size;

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 18:46    [W:3.250 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site