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

Commit 42a105e9 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm: Remove memptrs->wptr 



memptrs->wptr seems to be unused. Remove it to avoid
confusing the upcoming preemption code.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 5770fc7a

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

+0 −3
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ int adreno_hw_init(struct msm_gpu *gpu) 
	/* 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,
@@ -258,7 +257,6 @@ void adreno_show(struct msm_gpu *gpu, struct seq_file *m) 
	seq_printf(m, "fence:    %d/%d\n", adreno_gpu->memptrs->fence,

			gpu->fctx->last_fence);

	seq_printf(m, "rptr:     %d\n", get_rptr(adreno_gpu));

	seq_printf(m, "wptr:     %d\n", adreno_gpu->memptrs->wptr);

	seq_printf(m, "rb wptr:  %d\n", get_wptr(gpu->rb));



	/* dump these out in a form that can be parsed by demsm: */
@@ -294,7 +292,6 @@ void adreno_dump_info(struct msm_gpu *gpu) 
	printk("fence:    %d/%d\n", adreno_gpu->memptrs->fence,

			gpu->fctx->last_fence);

	printk("rptr:     %d\n", get_rptr(adreno_gpu));

	printk("wptr:     %d\n", adreno_gpu->memptrs->wptr);

	printk("rb wptr:  %d\n", get_wptr(gpu->rb));

}

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

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ const struct adreno_info *adreno_info(struct adreno_rev rev); 


struct adreno_rbmemptrs {

	volatile uint32_t rptr;

	volatile uint32_t wptr;

	volatile uint32_t fence;

};