| Message ID | 20201004192152.3298573-4-robdclark@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/msm: de-struct_mutex-ification | expand |
On Sun, Oct 04, 2020 at 12:21:35PM -0700, Rob Clark wrote: > From: Rob Clark <robdclark@chromium.org> > > Small cleanup, update_fences() is used in the hangcheck path, but also > in the normal retire path. Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org> > Signed-off-by: Rob Clark <robdclark@chromium.org> > --- > drivers/gpu/drm/msm/msm_gpu.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index 31fce3ac0cdc..ca8c95b32c8b 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -265,6 +265,20 @@ int msm_gpu_hw_init(struct msm_gpu *gpu) > return ret; > } > > +static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring, > + uint32_t fence) > +{ > + struct msm_gem_submit *submit; > + > + list_for_each_entry(submit, &ring->submits, node) { > + if (submit->seqno > fence) > + break; > + > + msm_update_fence(submit->ring->fctx, > + submit->fence->seqno); > + } > +} > + > #ifdef CONFIG_DEV_COREDUMP > static ssize_t msm_gpu_devcoredump_read(char *buffer, loff_t offset, > size_t count, void *data, size_t datalen) > @@ -411,20 +425,6 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, > * Hangcheck detection for locked gpu: > */ > > -static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring, > - uint32_t fence) > -{ > - struct msm_gem_submit *submit; > - > - list_for_each_entry(submit, &ring->submits, node) { > - if (submit->seqno > fence) > - break; > - > - msm_update_fence(submit->ring->fctx, > - submit->fence->seqno); > - } > -} > - > static struct msm_gem_submit * > find_submit(struct msm_ringbuffer *ring, uint32_t fence) > { > -- > 2.26.2 > > _______________________________________________ > Freedreno mailing list > Freedreno@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/freedreno
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 31fce3ac0cdc..ca8c95b32c8b 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -265,6 +265,20 @@ int msm_gpu_hw_init(struct msm_gpu *gpu) return ret; } +static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring, + uint32_t fence) +{ + struct msm_gem_submit *submit; + + list_for_each_entry(submit, &ring->submits, node) { + if (submit->seqno > fence) + break; + + msm_update_fence(submit->ring->fctx, + submit->fence->seqno); + } +} + #ifdef CONFIG_DEV_COREDUMP static ssize_t msm_gpu_devcoredump_read(char *buffer, loff_t offset, size_t count, void *data, size_t datalen) @@ -411,20 +425,6 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, * Hangcheck detection for locked gpu: */ -static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring, - uint32_t fence) -{ - struct msm_gem_submit *submit; - - list_for_each_entry(submit, &ring->submits, node) { - if (submit->seqno > fence) - break; - - msm_update_fence(submit->ring->fctx, - submit->fence->seqno); - } -} - static struct msm_gem_submit * find_submit(struct msm_ringbuffer *ring, uint32_t fence) {