[PATCH] drm/amdgpu: Apply noretry setting for mmhub9.4

[Felix Kuehling]

On 2019-11-22 5:55 p.m., Oak Zeng wrote:
> Config the translation retry behavior according to noretry
> kernel parameter
>
> Change-Id: I5b91ea77715137cf8cb84e258ccdfbb19c7a4ed1
> Signed-off-by: Oak Zeng <Oak.Zeng at amd.com>
> Suggested-by: Jay Cornwall <Jay.Cornwall at amd.com>

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


> ---
>   drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> index 753eea2..8599bfd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
> @@ -314,7 +314,8 @@ static void mmhub_v9_4_setup_vmid_config(struct amdgpu_device *adev, int hubid)
>   				    adev->vm_manager.block_size - 9);
>   		/* Send no-retry XNACK on fault to suppress VM fault storm. */
>   		tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT1_CNTL,
> -				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);
> +				    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT,
> +				    !amdgpu_noretry);
>   		WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT1_CNTL,
>   				    hubid * MMHUB_INSTANCE_REGISTER_OFFSET + i,
>   				    tmp);
> @@ -905,4 +906,4 @@ static void mmhub_v9_4_query_ras_error_count(struct amdgpu_device *adev,
>   const struct amdgpu_mmhub_funcs mmhub_v9_4_funcs = {
>   	.ras_late_init = amdgpu_mmhub_ras_late_init,
>   	.query_ras_error_count = mmhub_v9_4_query_ras_error_count,
> -};
> \ No newline at end of file
> +};