We are going to soon deal with lot more fences, so change the generic
name 'fence' to hw_fence to denote association with an actual hardware
submission.
Signed-off-by: Sharat Masetty <smasetty@xxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/msm_gem.h | 2 +-
drivers/gpu/drm/msm/msm_gem_submit.c | 17 ++++++++---------
drivers/gpu/drm/msm/msm_gpu.c | 16 ++++++++--------
3 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index 289abe5..cae3aa5 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -143,7 +143,7 @@ struct msm_gem_submit {
struct list_head bo_list;
struct ww_acquire_ctx ticket;
uint32_t seqno; /* Sequence number of the submit on the ring */
- struct dma_fence *fence;
+ struct dma_fence *hw_fence;
int out_fence_id;
struct msm_gpu_submitqueue *queue;
struct pid *pid; /* submitting process */
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 14906b9..fd28ace 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -48,7 +48,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
submit->dev = dev;
submit->gpu = gpu;
submit->ctx = ctx;
- submit->fence = NULL;
+ submit->hw_fence = NULL;
submit->out_fence_id = -1;
submit->pid = get_pid(task_pid(current));
submit->cmd = (void *)&submit->bos[nr_bos];
@@ -70,7 +70,7 @@ void msm_gem_submit_free(struct msm_gem_submit *submit)
{
idr_remove(&submit->ring->fence_idr, submit->out_fence_id);
- dma_fence_put(submit->fence);
+ dma_fence_put(submit->hw_fence);
list_del(&submit->node);
put_pid(submit->pid);
msm_submitqueue_put(submit->queue);
@@ -563,9 +563,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
submit->nr_cmds = i;
msm_gpu_submit(submit);
- if (IS_ERR(submit->fence)) {
- ret = PTR_ERR(submit->fence);
- submit->fence = NULL;
+ if (IS_ERR(submit->hw_fence)) {
+ ret = PTR_ERR(submit->hw_fence);
+ submit->hw_fence = NULL;
goto out;
}
@@ -573,9 +573,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
* No protection should be okay here since this is protected by the big
* GPU lock.
*/
- submit->out_fence_id = idr_alloc_cyclic(&ring->fence_idr, submit->fence,
- 0, INT_MAX, GFP_KERNEL);
-
+ submit->out_fence_id = idr_alloc_cyclic(&ring->fence_idr,
+ submit->hw_fence, 0, INT_MAX, GFP_KERNEL);
if (submit->out_fence_id < 0) {
ret = -ENOMEM;
goto out;
@@ -584,7 +583,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
args->fence = submit->out_fence_id;
if (args->flags & MSM_SUBMIT_FENCE_FD_OUT) {
- sync_file = sync_file_create(submit->fence);
+ sync_file = sync_file_create(submit->hw_fence);
if (!sync_file) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 5f9cd85..449cc23 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -287,7 +287,7 @@ static void update_fences(struct msm_gpu *gpu, struct msm_ringbuffer *ring,
break;
msm_update_fence(submit->ring->fctx,
- submit->fence->seqno);
+ submit->hw_fence->seqno);
}
}
@@ -573,7 +573,7 @@ static void retire_submits(struct msm_gpu *gpu)
struct msm_ringbuffer *ring = gpu->rb[i];
list_for_each_entry_safe(submit, tmp, &ring->submits, node) {
- if (dma_fence_is_signaled(submit->fence))
+ if (dma_fence_is_signaled(submit->hw_fence))
retire_submit(gpu, submit);
}
}
@@ -612,9 +612,9 @@ struct dma_fence *msm_gpu_submit(struct msm_gem_submit *submit)
WARN_ON(!mutex_is_locked(&dev->struct_mutex));
- submit->fence = msm_fence_alloc(ring->fctx);
- if (IS_ERR(submit->fence))
- return submit->fence;
+ submit->hw_fence = msm_fence_alloc(ring->fctx);
+ if (IS_ERR(submit->hw_fence))
+ return submit->hw_fence;
pm_runtime_get_sync(&gpu->pdev->dev);
@@ -643,9 +643,9 @@ struct dma_fence *msm_gpu_submit(struct msm_gem_submit *submit)
submit->gpu->aspace, &iova);
if (submit->bos[i].flags & MSM_SUBMIT_BO_WRITE)
- msm_gem_move_to_active(&msm_obj->base, gpu, true, submit->fence);
+ msm_gem_move_to_active(&msm_obj->base, gpu, true, submit->hw_fence);
else if (submit->bos[i].flags & MSM_SUBMIT_BO_READ)
- msm_gem_move_to_active(&msm_obj->base, gpu, false, submit->fence);
+ msm_gem_move_to_active(&msm_obj->base, gpu, false, submit->hw_fence);
}
gpu->funcs->submit(gpu, submit, submit->ctx);
@@ -653,7 +653,7 @@ struct dma_fence *msm_gpu_submit(struct msm_gem_submit *submit)
hangcheck_timer_reset(gpu);
- return submit->fence;
+ return submit->hw_fence;
}
/*
--
1.9.1
