Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de098e5f authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/adreno: reset ringbuffer in hw_init 



We need to do this also in resume path when we need to re-hw_init().

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent eeb75474

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+8 −10
Original line number Diff line number Diff line
@@ -68,6 +68,14 @@ int adreno_hw_init(struct msm_gpu *gpu) 
		return ret;

	}



	/* reset ringbuffer: */

	gpu->rb->cur = gpu->rb->start;



	/* reset completed fence seqno: */

	adreno_gpu->memptrs->fence = gpu->fctx->completed_fence;

	adreno_gpu->memptrs->rptr  = 0;

	adreno_gpu->memptrs->wptr  = 0;



	/* Setup REG_CP_RB_CNTL: */

	adreno_gpu_write(adreno_gpu, REG_ADRENO_CP_RB_CNTL,

			/* size is log2(quad-words): */
@@ -111,7 +119,6 @@ uint32_t adreno_last_fence(struct msm_gpu *gpu) 


void adreno_recover(struct msm_gpu *gpu)

{

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	struct drm_device *dev = gpu->dev;

	int ret;
@@ -119,15 +126,6 @@ void adreno_recover(struct msm_gpu *gpu) 
	// so maybe continuing to call ->pm_suspend/resume() is better?



	gpu->funcs->pm_suspend(gpu);



	/* reset ringbuffer: */

	gpu->rb->cur = gpu->rb->start;



	/* reset completed fence seqno: */

	adreno_gpu->memptrs->fence = gpu->fctx->completed_fence;

	adreno_gpu->memptrs->rptr  = 0;

	adreno_gpu->memptrs->wptr  = 0;



	gpu->funcs->pm_resume(gpu);



	ret = msm_gpu_hw_init(gpu);