evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/msm: Remove next_fence

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

Change-Id: Ic0dedbada687f899eca1017ecfd77fbd2aa8e114
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse 2017-06-28 09:55:12 -06:00
parent c94c4109c3
commit 84200abc78
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/msm/msm_drv.h
View file

@ -297,7 +297,6 @@ struct msm_drm_private {
struct drm_fb_helper *fbdev; struct drm_fb_helper *fbdev;
uint32_t next_fence[MSM_GPU_MAX_RINGS];
uint32_t completed_fence[MSM_GPU_MAX_RINGS]; uint32_t completed_fence[MSM_GPU_MAX_RINGS];
wait_queue_head_t fence_event; wait_queue_head_t fence_event;

3
drivers/gpu/drm/msm/msm_gpu.c
View file

@ -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) int msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)
{ {
struct drm_device *dev = gpu->dev; struct drm_device *dev = gpu->dev;
struct msm_drm_private *priv = dev->dev_private;
struct msm_ringbuffer *ring = gpu->rb[submit->ring]; struct msm_ringbuffer *ring = gpu->rb[submit->ring];
int i; int i;
WARN_ON(!mutex_is_locked(&dev->struct_mutex)); 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); inactive_cancel(gpu);

1
drivers/gpu/drm/msm/msm_ringbuffer.h
View file

@ -47,6 +47,7 @@ struct msm_ringbuffer {
struct drm_gem_object *bo; struct drm_gem_object *bo;
uint32_t *start, *end, *cur, *next; uint32_t *start, *end, *cur, *next;
uint64_t iova; uint64_t iova;
uint32_t seqno;
uint32_t submitted_fence; uint32_t submitted_fence;
spinlock_t lock; spinlock_t lock;
struct list_head submits; struct list_head submits;