[PATCH] drm/amdgpu/gmc10: remove dummy read workaround for newer chips

[Christian König]

Am 16.10.20 um 18:57 schrieb Alex Deucher:
> Sienna Cichlid and newer have a hw fix so no longer require
> the workaround.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index f7a8417b2946..40af17610207 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.cbrahma/amd-staging-drm-next
> @@ -107,7 +107,8 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev,
>   		 * be updated to avoid reading an incorrect value due to
>   		 * the new fast GRBM interface.
>   		 */
> -		if (entry->vmid_src == AMDGPU_GFXHUB_0)
> +		if ((entry->vmid_src == AMDGPU_GFXHUB_0) &&
> +		    (adev->asic_type < CHIP_SIENNA_CICHLID))
>   			RREG32(hub->vm_l2_pro_fault_status);
>   
>   		status = RREG32(hub->vm_l2_pro_fault_status);
> @@ -232,7 +233,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
>   	 * Issue a dummy read to wait for the ACK register to be cleared
>   	 * to avoid a false ACK due to the new fast GRBM interface.
>   	 */
> -	if (vmhub == AMDGPU_GFXHUB_0)
> +	if ((vmhub == AMDGPU_GFXHUB_0) &&
> +	    (adev->asic_type < CHIP_SIENNA_CICHLID))
>   		RREG32_NO_KIQ(hub->vm_inv_eng0_req + hub->eng_distance * eng);
>   
>   	/* Wait for ACK with a delay.*/