diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2017-11-23 17:57:12 +0100 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2018-01-02 17:28:09 +0100 |
| commit | 10009ea2e4cf86c678605cf154e09acb483f2be1 (patch) | |
| tree | ab1220098b3f22ecddc35e7ff8149c7385f78222 /drivers/gpu/drm/etnaviv | |
| parent | 0236efe97e165a1eefef9c38c8b3d10133a3e627 (diff) | |
| download | linux-stable-10009ea2e4cf86c678605cf154e09acb483f2be1.tar.gz linux-stable-10009ea2e4cf86c678605cf154e09acb483f2be1.tar.bz2 linux-stable-10009ea2e4cf86c678605cf154e09acb483f2be1.zip | |
drm/etnaviv: rename submit fence to out_fence
This is the fence passed out on a sucessful GPU submit. Make the name
more clear.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/etnaviv')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 12 | ||||
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h index dc478f014d29..848daf719cda 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h @@ -103,7 +103,7 @@ struct etnaviv_gem_submit_bo { struct etnaviv_gem_submit { struct etnaviv_gpu *gpu; struct ww_acquire_ctx ticket; - struct dma_fence *fence; + struct dma_fence *out_fence; u32 flags; unsigned int nr_bos; struct etnaviv_gem_submit_bo bos[0]; diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c index 72468f11dd16..930577c8794e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c @@ -189,10 +189,10 @@ static void submit_attach_object_fences(struct etnaviv_gem_submit *submit) if (submit->bos[i].flags & ETNA_SUBMIT_BO_WRITE) reservation_object_add_excl_fence(etnaviv_obj->resv, - submit->fence); + submit->out_fence); else reservation_object_add_shared_fence(etnaviv_obj->resv, - submit->fence); + submit->out_fence); submit_unlock_object(submit, i); } @@ -359,8 +359,8 @@ static void submit_cleanup(struct etnaviv_gem_submit *submit) } ww_acquire_fini(&submit->ticket); - if (submit->fence) - dma_fence_put(submit->fence); + if (submit->out_fence) + dma_fence_put(submit->out_fence); kfree(submit); } @@ -537,7 +537,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, * fence to the sync file here, eliminating the ENOMEM * possibility at this stage. */ - sync_file = sync_file_create(submit->fence); + sync_file = sync_file_create(submit->out_fence); if (!sync_file) { ret = -ENOMEM; goto out; @@ -546,7 +546,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, } args->fence_fd = out_fence_fd; - args->fence = submit->fence->seqno; + args->fence = submit->out_fence->seqno; out: submit_unpin_objects(submit); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 93d71ad2d681..0d0c9e3964cb 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1413,8 +1413,8 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, } gpu->event[event[0]].fence = fence; - submit->fence = dma_fence_get(fence); - gpu->active_fence = submit->fence->seqno; + submit->out_fence = dma_fence_get(fence); + gpu->active_fence = submit->out_fence->seqno; if (cmdbuf->nr_pmrs) { gpu->event[event[1]].sync_point = &sync_point_perfmon_sample_pre; |