[PATCH] drm/amd/amdgpu: Fix srbm_indexing in init/inactive hqd code

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Tom St Denis
> Sent: Tuesday, April 04, 2017 10:29 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: StDenis, Tom
> Subject: [PATCH] drm/amd/amdgpu: Fix srbm_indexing in init/inactive hqd
> code
> 
> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index 5a8e8aea99b9..3571c4895120 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -5289,6 +5289,7 @@ static void gfx_v8_0_inactive_hqd(struct
> amdgpu_device *adev,
>  {
>  	int i;
> 
> +	mutex_lock(&adev->srbm_mutex);
>  	vi_srbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
>  	if (RREG32(mmCP_HQD_ACTIVE) &
> CP_HQD_ACTIVE__ACTIVE_MASK) {
>  		WREG32_FIELD(CP_HQD_DEQUEUE_REQUEST,
> DEQUEUE_REQ, 2);
> @@ -5298,6 +5299,8 @@ static void gfx_v8_0_inactive_hqd(struct
> amdgpu_device *adev,
>  			udelay(1);
>  		}
>  	}
> +	vi_srbm_select(adev, 0, 0, 0, 0);
> +	mutex_unlock(&adev->srbm_mutex);
>  }
> 
>  static int gfx_v8_0_pre_soft_reset(void *handle)
> @@ -5403,11 +5406,13 @@ static int gfx_v8_0_soft_reset(void *handle)
>  static void gfx_v8_0_init_hqd(struct amdgpu_device *adev,
>  			      struct amdgpu_ring *ring)
>  {
> +	mutex_lock(&adev->srbm_mutex);
>  	vi_srbm_select(adev, ring->me, ring->pipe, ring->queue, 0);
>  	WREG32(mmCP_HQD_DEQUEUE_REQUEST, 0);
>  	WREG32(mmCP_HQD_PQ_RPTR, 0);
>  	WREG32(mmCP_HQD_PQ_WPTR, 0);
>  	vi_srbm_select(adev, 0, 0, 0, 0);
> +	mutex_unlock(&adev->srbm_mutex);
>  }
> 
>  static int gfx_v8_0_post_soft_reset(void *handle)
> --
> 2.12.0
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx