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>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
index dc478f014d29ff494a00356ccc5e5066eb5bbe75..848daf719cda6b9b402e5f684ebca4cf28695587 100644 (file)
--- 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 72468f11dd160f63b86054500f83215d9aec57a4..930577c8794e1f8f43c9d7bf56a4b424dbd4bca6 100644 (file)
--- 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 93d71ad2d6815779b80d01b66c042a8627d653e9..0d0c9e3964cb2f110f40761c71e36eda18c915bd 100644 (file)
--- 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;