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

Commit 84200abc authored by Jordan Crouse's avatar Jordan Crouse
Browse files

drm/msm: Remove next_fence 



The next_fence array is left over from when we started storing
per-ring information.

Change-Id: Ic0dedbada687f899eca1017ecfd77fbd2aa8e114
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent c94c4109

drivers/gpu/drm/msm/msm_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ struct msm_drm_private { 


	struct drm_fb_helper *fbdev;



	uint32_t next_fence[MSM_GPU_MAX_RINGS];

	uint32_t completed_fence[MSM_GPU_MAX_RINGS];



	wait_queue_head_t fence_event;

drivers/gpu/drm/msm/msm_gpu.c

+1 −2
Original line number Diff line number Diff line
@@ -567,13 +567,12 @@ void msm_gpu_retire(struct msm_gpu *gpu) 
int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)

{

	struct drm_device *dev = gpu->dev;

	struct msm_drm_private *priv = dev->dev_private;

	struct msm_ringbuffer *ring = gpu->rb[submit->ring];

	int i;



	WARN_ON(!mutex_is_locked(&dev->struct_mutex));



	submit->fence = FENCE(submit->ring, ++priv->next_fence[submit->ring]);

	submit->fence = FENCE(submit->ring, ++ring->seqno);



	inactive_cancel(gpu);

drivers/gpu/drm/msm/msm_ringbuffer.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct msm_ringbuffer { 
	struct drm_gem_object *bo;

	uint32_t *start, *end, *cur, *next;

	uint64_t iova;

	uint32_t seqno;

	uint32_t submitted_fence;

	spinlock_t lock;

	struct list_head submits;