Re: [PATCH] gpu: drm: amd: amdgpu: remove dead code

[Christian KÃnig]

Am 08.05.2017 um 18:41 schrieb Gustavo A. R. Silva:
> Local variable use_doorbell is assigned to a constant value and it is never
> updated again. Remove this variable and the dead code it guards.
>
> Addresses-Coverity-ID: 1401837
> Signed-off-by: Gustavo A. R. Silva <garsilva@xxxxxxxxxxxxxx>

Acked-by: Christian König <christian.koenig@xxxxxxx> for this one and 
the same patch for gfx_v8.

> ---
>   drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 20 ++++++--------------
>   1 file changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> index 1f93545..27ea28f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
> @@ -2936,7 +2936,6 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)
>   {
>   	int r, i, j;
>   	u32 tmp;
> -	bool use_doorbell = true;
>   	u64 hqd_gpu_addr;
>   	u64 mqd_gpu_addr;
>   	u64 eop_gpu_addr;
> @@ -3034,10 +3033,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)
>   		/* enable doorbell? */
>   		mqd->queue_state.cp_hqd_pq_doorbell_control =
>   			RREG32(mmCP_HQD_PQ_DOORBELL_CONTROL);
> -		if (use_doorbell)
> -			mqd->queue_state.cp_hqd_pq_doorbell_control |= CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_EN_MASK;
> -		else
> -			mqd->queue_state.cp_hqd_pq_doorbell_control &= ~CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_EN_MASK;
> +		mqd->queue_state.cp_hqd_pq_doorbell_control |= CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_EN_MASK;
>   		WREG32(mmCP_HQD_PQ_DOORBELL_CONTROL,
>   		       mqd->queue_state.cp_hqd_pq_doorbell_control);
>   
> @@ -3116,23 +3112,19 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev)
>   		       mqd->queue_state.cp_hqd_pq_rptr_report_addr_hi);
>   
>   		/* enable the doorbell if requested */
> -		if (use_doorbell) {
> -			mqd->queue_state.cp_hqd_pq_doorbell_control =
> +		mqd->queue_state.cp_hqd_pq_doorbell_control =
>   				RREG32(mmCP_HQD_PQ_DOORBELL_CONTROL);
> -			mqd->queue_state.cp_hqd_pq_doorbell_control &=
> +		mqd->queue_state.cp_hqd_pq_doorbell_control &=
>   				~CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_OFFSET_MASK;
> -			mqd->queue_state.cp_hqd_pq_doorbell_control |=
> +		mqd->queue_state.cp_hqd_pq_doorbell_control |=
>   				(ring->doorbell_index <<
>   				 CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_OFFSET__SHIFT);
> -			mqd->queue_state.cp_hqd_pq_doorbell_control |=
> +		mqd->queue_state.cp_hqd_pq_doorbell_control |=
>   				CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_EN_MASK;
> -			mqd->queue_state.cp_hqd_pq_doorbell_control &=
> +		mqd->queue_state.cp_hqd_pq_doorbell_control &=
>   				~(CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_SOURCE_MASK |
>   				CP_HQD_PQ_DOORBELL_CONTROL__DOORBELL_HIT_MASK);
>   
> -		} else {
> -			mqd->queue_state.cp_hqd_pq_doorbell_control = 0;
> -		}
>   		WREG32(mmCP_HQD_PQ_DOORBELL_CONTROL,
>   		       mqd->queue_state.cp_hqd_pq_doorbell_control);
>