brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Lucas Stach 2017-11-23 17:57:12 +01:00
parent 0236efe97e
commit 10009ea2e4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/etnaviv/etnaviv_gem.h
View File

@ -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];

12
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
View File

@ -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);

4
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
View File

@ -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;