mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Adrián Larumbe" <adrian.larumbe@collabora.com>
To: Boris Brezillon <boris.brezillon@collabora.com>,
	Rob Herring <robh@kernel.org>,
	Steven Price <steven.price@arm.com>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
	Philipp Zabel <p.zabel@pengutronix.de>
Cc: kernel@collabora.com,
	"Adrián Larumbe" <adrian.larumbe@collabora.com>,
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] drm/panfrost: Refactor job IRQ enabling sequence
Date: Tue, 15 Oct 2024 00:31:42 +0100	[thread overview]
Message-ID: <20241014233758.994861-7-adrian.larumbe@collabora.com> (raw)
In-Reply-To: <20241014233758.994861-1-adrian.larumbe@collabora.com>

Just a convenience macro to avoid reduplication.

Signed-off-by: Adrián Larumbe <adrian.larumbe@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


  parent reply	other threads:[~2024-10-14 23:38 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-14 23:31 [PATCH 1/9] drm/panfrost: Replace DRM driver allocation method with newer one Adrián Larumbe
2024-10-14 23:31 ` [PATCH 2/9] drm/panfrost: handle inexistent GPU during probe Adrián Larumbe
2024-10-21 14:06   ` Boris Brezillon
2024-10-24 14:55     ` Steven Price
2024-10-14 23:31 ` [PATCH 3/9] drm/panfrost: handle error when allocating AS number Adrián Larumbe
2024-10-21 14:07   ` Boris Brezillon
2024-10-14 23:31 ` [PATCH 4/9] drm/panfrost: handle job hw submit errors Adrián Larumbe
2024-10-21 14:14   ` Boris Brezillon
2024-10-14 23:31 ` [PATCH 5/9] drm/panfrost: Handle page mapping failure Adrián Larumbe
2024-10-21 14:32   ` Boris Brezillon
2024-10-14 23:31 ` [PATCH 6/9] drm/panfrost: Avoid re-enabling job interrupts in the reset path Adrián Larumbe
2024-10-21 14:52   ` Boris Brezillon
2024-10-14 23:31 ` Adrián Larumbe [this message]
2024-10-14 23:31 ` [PATCH 8/9] drm/panfrost: Add forward declaration and types header Adrián Larumbe
2024-10-14 23:31 ` [PATCH 9/9] drm/panfrost: Explicitly clean up panfrost fence Adrián Larumbe
2024-10-16 13:12   ` Christian König
2024-10-16 16:43     ` Adrián Larumbe
2024-10-17  9:27       ` Christian König
2024-10-17 12:44 ` [PATCH 1/9] drm/panfrost: Replace DRM driver allocation method with newer one Boris Brezillon
2024-10-24 14:55 ` Steven Price

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241014233758.994861-7-adrian.larumbe@collabora.com \
    --to=adrian.larumbe@collabora.com \
    --cc=airlied@gmail.com \
    --cc=boris.brezillon@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kernel@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=robh@kernel.org \
    --cc=simona@ffwll.ch \
    --cc=steven.price@arm.com \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®