[PATCH 7/9] drm/panfrost: Refactor job IRQ enabling sequence

[Adrián Larumbe]

Just a convenience macro to avoid reduplication.

Signed-off-by: Adrián Larumbe <adrian.laru...@collabora.com>
---
 drivers/gpu/drm/panfrost/panfrost_job.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c 
b/drivers/gpu/drm/panfrost/panfrost_job.c
index 68be555c6c52..5d83c6a148ec 100644
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -27,6 +27,11 @@
 #define job_write(dev, reg, data) writel(data, dev->iomem + (reg))
 #define job_read(dev, reg) readl(dev->iomem + (reg))
 
+#define enable_job_interrupts(pfdev)                           \
+       job_write((pfdev), JOB_INT_MASK,                        \
+                 GENMASK(16 + NUM_JOB_SLOTS - 1, 16) |         \
+                 GENMASK(NUM_JOB_SLOTS - 1, 0))
+
 struct panfrost_queue_state {
        struct drm_gpu_scheduler sched;
        u64 fence_context;
@@ -741,9 +746,7 @@ panfrost_reset(struct panfrost_device *pfdev,
                drm_sched_start(&pfdev->js->queue[i].sched, 0);
 
        /* Re-enable job interrupts now that everything has been restarted. */
-       job_write(pfdev, JOB_INT_MASK,
-                 GENMASK(16 + NUM_JOB_SLOTS - 1, 16) |
-                 GENMASK(NUM_JOB_SLOTS - 1, 0));
+       enable_job_interrupts(pfdev);
 
        dma_fence_end_signalling(cookie);
 }
@@ -816,9 +819,7 @@ static irqreturn_t panfrost_job_irq_handler_thread(int irq, 
void *data)
 
        /* Enable interrupts only if we're not about to get suspended */
        if (!test_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended))
-               job_write(pfdev, JOB_INT_MASK,
-                         GENMASK(16 + NUM_JOB_SLOTS - 1, 16) |
-                         GENMASK(NUM_JOB_SLOTS - 1, 0));
+               enable_job_interrupts(pfdev);
 
        return IRQ_HANDLED;
 }
-- 
2.46.2