drm/etnaviv: split fence lock

The fence lock currently protects two distinct things. It protects the fence
IDR from concurrent inserts and removes and also keeps drm_sched_job_arm and
drm_sched_entity_push_job in one atomic section to guarantee the fence seqno
monotonicity. Split the lock into those two functions.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
(cherry picked from commit 880ab177a16574d540a04d12d6c00668cf90bb18)
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index 54924d66ab10b5a0901cdcac6475991e092a9657..d42dd8013d8e1db9882cd7e930a8ef2357751995 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -407,9 +407,9 @@ static void submit_cleanup(struct kref *kref)
                dma_fence_put(submit->in_fence);
        if (submit->out_fence) {
                /* first remove from IDR, so fence can not be found anymore */
-               mutex_lock(&submit->gpu->fence_lock);
+               mutex_lock(&submit->gpu->idr_lock);
                idr_remove(&submit->gpu->fence_idr, submit->out_fence_id);
-               mutex_unlock(&submit->gpu->fence_lock);
+               mutex_unlock(&submit->gpu->idr_lock);
                dma_fence_put(submit->out_fence);
        }
 

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 7a64386befc182b51ca092bc1a67dbb9164ce5ac..cd93b73b96f8efd2f6bdc564c175885b161761c9 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1821,7 +1821,8 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
 
        gpu->dev = &pdev->dev;
        mutex_init(&gpu->lock);
-       mutex_init(&gpu->fence_lock);
+       mutex_init(&gpu->sched_lock);
+       mutex_init(&gpu->idr_lock);
 
        /* Map registers: */
        gpu->mmio = devm_platform_ioremap_resource(pdev, 0);

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
index b3a0941d56fd37efef360f6fc8919d6d3a85cf4e..c32820cc5b38ea89439d67c018dfa8c9f9bcc137 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
@@ -99,6 +99,7 @@ struct etnaviv_gpu {
        struct etnaviv_chip_identity identity;
        enum etnaviv_sec_mode sec_mode;
        struct workqueue_struct *wq;
+       struct mutex sched_lock;
        struct drm_gpu_scheduler sched;
        bool initialized;
        bool fe_running;
@@ -116,7 +117,7 @@ struct etnaviv_gpu {
        u32 idle_mask;
 
        /* Fencing support */
-       struct mutex fence_lock;
+       struct mutex idr_lock;
        struct idr fence_idr;
        u32 next_fence;
        u32 completed_fence;

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
index f54d98c2d7bb8ff07ace1d01619d72dfa52ac451..2dea74c2b8fc44f433f8aa1bc520e29b99645dd9 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c
@@ -146,14 +146,16 @@ static const struct drm_sched_backend_ops etnaviv_sched_ops = {
 int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity,
                           struct etnaviv_gem_submit *submit)
 {
+       struct etnaviv_gpu *gpu = submit->gpu;
        int ret = 0;
 
        /*
         * Hold the fence lock across the whole operation to avoid jobs being
+        * Hold the sched lock across the whole operation to avoid jobs being
         * pushed out of order with regard to their sched fence seqnos as
         * allocated in drm_sched_job_init.
         */
-       mutex_lock(&submit->gpu->fence_lock);
+       mutex_lock(&gpu->sched_lock);
 
        ret = drm_sched_job_init(&submit->sched_job, sched_entity,
                                 submit->ctx);
@@ -161,9 +163,11 @@ int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity,
                goto out_unlock;
 
        submit->out_fence = dma_fence_get(&submit->sched_job.s_fence->finished);
-       submit->out_fence_id = idr_alloc_cyclic(&submit->gpu->fence_idr,
+       mutex_lock(&gpu->idr_lock);
+       submit->out_fence_id = idr_alloc_cyclic(&gpu->fence_idr,
                                                submit->out_fence, 0,
                                                INT_MAX, GFP_KERNEL);
+       mutex_unlock(&gpu->idr_lock);
        if (submit->out_fence_id < 0) {
                drm_sched_job_cleanup(&submit->sched_job);
                ret = -ENOMEM;
@@ -176,7 +180,7 @@ int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity,
        drm_sched_entity_push_job(&submit->sched_job, sched_entity);
 
 out_unlock:
-       mutex_unlock(&submit->gpu->fence_lock);
+       mutex_unlock(&gpu->sched_lock);
 
        return ret;
 }