[PATCH 1/2] drm/amdkfd: Fix MQD size calculation

[Kuehling, Felix]

On 2019-10-04 10:48, Zeng, Oak wrote:
> On device initialization, a trunk 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.
>
> Change-Id: Iecd11ae4f5a314591566772aa2a23e1fe4b94275
> Reported-by: Jonathan Kim <Jonathan.Kim at amd.com>
> Signed-off-by: Jonathan Kim <Jonathan.Kim at amd.com>
> Signed-off-by: Oak Zeng <Oak.Zeng at amd.com>

Minor cosmetic nit-pick inline that checkpatch.pl would probably warn 
about. With that fixed, this patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>


> ---
>   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 16c04f8..e55d021 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
> @@ -1849,7 +1849,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)*

There should be a space between ) and *.


>   		dev->device_info->num_sdma_queues_per_engine +
>   		dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]->mqd_size;
>