[PATCH] drm/msm/A5xx: Skip hardware preemption init if no preemption

[Jordan Crouse]

On Fri, Sep 14, 2018 at 02:08:55PM +0530, Sharat Masetty wrote:
> In the case where preemption is not enabled, this patch simply skips
> preemption related initialization in hardware init sequence.

Reviewed-by: Jordan Crouse <jcrouse at codeaurora.org>

> Signed-off-by: Sharat Masetty <smasetty at codeaurora.org>
> ---
>  drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
> index 970c796..6a3c560 100644
> --- a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
> +++ b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c
> @@ -208,6 +208,13 @@ void a5xx_preempt_hw_init(struct msm_gpu *gpu)
>  	struct a5xx_gpu *a5xx_gpu = to_a5xx_gpu(adreno_gpu);
>  	int i;
>  
> +	/* Always come up on rb 0 */
> +	a5xx_gpu->cur_ring = gpu->rb[0];
> +
> +	/* No preemption if we only have one ring */
> +	if (gpu->nr_rings == 1)
> +		return;
> +
>  	for (i = 0; i < gpu->nr_rings; i++) {
>  		a5xx_gpu->preempt[i]->wptr = 0;
>  		a5xx_gpu->preempt[i]->rptr = 0;
> @@ -220,9 +227,6 @@ void a5xx_preempt_hw_init(struct msm_gpu *gpu)
>  
>  	/* Reset the preemption state */
>  	set_preempt_state(a5xx_gpu, PREEMPT_NONE);
> -
> -	/* Always come up on rb 0 */
> -	a5xx_gpu->cur_ring = gpu->rb[0];
>  }
>  
>  static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu,
> -- 
> 1.9.1
> 

-- 
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project