drm/panfrost: Don't corrupt the queue mutex on open/close

[ Upstream commit a17d609e3e216c406f7c0cec2a94086a4401ac06 ]

The mutex within the panfrost_queue_state should have the lifetime of
the queue, however it was erroneously initialised/destroyed during
panfrost_job_{open,close} which is called every time a client
opens/closes the drm node.

Move the initialisation/destruction to panfrost_job_{init,fini} where it
belongs.

Fixes: 1a11a88cfd9a ("drm/panfrost: Fix job timeout handling")
Signed-off-by: Steven Price <steven.price@arm.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201029170047.30564-1-steven.price@arm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 1ce2001106e5693dcd791f869abbdd39dd58fb77..517dfb247a80126a764aa42a916f97cc067ee852 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -617,6 +617,8 @@ int panfrost_job_init(struct panfrost_device *pfdev)
        }
 
        for (j = 0; j < NUM_JOB_SLOTS; j++) {
+               mutex_init(&js->queue[j].lock);
+
                js->queue[j].fence_context = dma_fence_context_alloc(1);
 
                ret = drm_sched_init(&js->queue[j].sched,
@@ -647,8 +649,10 @@ void panfrost_job_fini(struct panfrost_device *pfdev)
 
        job_write(pfdev, JOB_INT_MASK, 0);
 
-       for (j = 0; j < NUM_JOB_SLOTS; j++)
+       for (j = 0; j < NUM_JOB_SLOTS; j++) {
                drm_sched_fini(&js->queue[j].sched);
+               mutex_destroy(&js->queue[j].lock);
+       }
 
 }
 
@@ -660,7 +664,6 @@ int panfrost_job_open(struct panfrost_file_priv *panfrost_priv)
        int ret, i;
 
        for (i = 0; i < NUM_JOB_SLOTS; i++) {
-               mutex_init(&js->queue[i].lock);
                sched = &js->queue[i].sched;
                ret = drm_sched_entity_init(&panfrost_priv->sched_entity[i],
                                            DRM_SCHED_PRIORITY_NORMAL, &sched,
@@ -677,10 +680,8 @@ void panfrost_job_close(struct panfrost_file_priv *panfrost_priv)
        struct panfrost_job_slot *js = pfdev->js;
        int i;
 
-       for (i = 0; i < NUM_JOB_SLOTS; i++) {
+       for (i = 0; i < NUM_JOB_SLOTS; i++)
                drm_sched_entity_destroy(&panfrost_priv->sched_entity[i]);
-               mutex_destroy(&js->queue[i].lock);
-       }
 }
 
 int panfrost_job_is_idle(struct panfrost_device *pfdev)