[PATCH 08/12] drm/amdgpu/gfx8: always restore kcq MQDs

[Christian König]

Am 27.04.23 um 17:27 schrieb Alex Deucher:
> Always restore the MQD not just when we do a reset.
> This allows us to move the MQD to VRAM if we want.
>
> v2: always reset ring pointer as well (Christian)
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com> for this one and 
same for other hw generations.

> ---
>   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 5de44d7e92de..2ae7f167985f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -4651,15 +4651,13 @@ static int gfx_v8_0_kcq_init_queue(struct amdgpu_ring *ring)
>   
>   		if (adev->gfx.mec.mqd_backup[mqd_idx])
>   			memcpy(adev->gfx.mec.mqd_backup[mqd_idx], mqd, sizeof(struct vi_mqd_allocation));
> -	} else if (amdgpu_in_reset(adev)) { /* for GPU_RESET case */
> -		/* reset MQD to a clean status */
> +	} else {
> +		/* restore MQD to a clean status */
>   		if (adev->gfx.mec.mqd_backup[mqd_idx])
>   			memcpy(mqd, adev->gfx.mec.mqd_backup[mqd_idx], sizeof(struct vi_mqd_allocation));
>   		/* reset ring buffer */
>   		ring->wptr = 0;
>   		amdgpu_ring_clear_ring(ring);
> -	} else {
> -		amdgpu_ring_clear_ring(ring);
>   	}
>   	return 0;
>   }