leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/panfrost: Use a threaded IRQ for job interrupts

Browse Source 
This should avoid switching to interrupt context when the GPU is under
heavy use.

v3:
* Don't take the job_lock in panfrost_job_handle_irq()

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210630062751.2832545-9-boris.brezillon@collabora.com
This commit is contained in:
Boris Brezillon 2021-06-30 08:27:43 +02:00
parent 229f45788e
commit 070ce7657b
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/gpu/drm/panfrost/panfrost_job.c
View File

@ -459,19 +459,12 @@ static const struct drm_sched_backend_ops panfrost_sched_ops = {
.free_job = panfrost_job_free .free_job = panfrost_job_free
}; };
static irqreturn_t panfrost_job_irq_handler(int irq, void *data) static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status)
{ {
struct panfrost_device *pfdev = data;
u32 status = job_read(pfdev, JOB_INT_STAT);
int j; int j;
dev_dbg(pfdev->dev, "jobslot irq status=%x\n", status); dev_dbg(pfdev->dev, "jobslot irq status=%x\n", status);
if (!status)
return IRQ_NONE;
pm_runtime_mark_last_busy(pfdev->dev);
for (j = 0; status; j++) { for (j = 0; status; j++) {
u32 mask = MK_JS_MASK(j); u32 mask = MK_JS_MASK(j);
@ -508,7 +501,6 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data)
if (status & JOB_INT_MASK_DONE(j)) { if (status & JOB_INT_MASK_DONE(j)) {
struct panfrost_job *job; struct panfrost_job *job;
spin_lock(&pfdev->js->job_lock);
job = pfdev->jobs[j]; job = pfdev->jobs[j];
/* Only NULL if job timeout occurred */ /* Only NULL if job timeout occurred */
if (job) { if (job) {
@ -520,21 +512,49 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data)
dma_fence_signal_locked(job->done_fence); dma_fence_signal_locked(job->done_fence);
pm_runtime_put_autosuspend(pfdev->dev); pm_runtime_put_autosuspend(pfdev->dev);
} }
spin_unlock(&pfdev->js->job_lock);
} }
status &= ~mask; status &= ~mask;
} }
}
static irqreturn_t panfrost_job_irq_handler_thread(int irq, void *data)
{
struct panfrost_device *pfdev = data;
u32 status = job_read(pfdev, JOB_INT_RAWSTAT);
while (status) {
pm_runtime_mark_last_busy(pfdev->dev);
spin_lock(&pfdev->js->job_lock);
panfrost_job_handle_irq(pfdev, status);
spin_unlock(&pfdev->js->job_lock);
status = job_read(pfdev, JOB_INT_RAWSTAT);
}
job_write(pfdev, JOB_INT_MASK,
GENMASK(16 + NUM_JOB_SLOTS - 1, 16) |
GENMASK(NUM_JOB_SLOTS - 1, 0));
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t panfrost_job_irq_handler(int irq, void *data)
{
struct panfrost_device *pfdev = data;
u32 status = job_read(pfdev, JOB_INT_STAT);
if (!status)
return IRQ_NONE;
job_write(pfdev, JOB_INT_MASK, 0);
return IRQ_WAKE_THREAD;
}
static void panfrost_reset(struct work_struct *work) static void panfrost_reset(struct work_struct *work)
{ {
struct panfrost_device *pfdev = container_of(work, struct panfrost_device *pfdev = container_of(work,
struct panfrost_device, struct panfrost_device,
reset.work); reset.work);
unsigned long flags;
unsigned int i; unsigned int i;
bool cookie; bool cookie;
@ -564,7 +584,7 @@ static void panfrost_reset(struct work_struct *work)
/* All timers have been stopped, we can safely reset the pending state. */ /* All timers have been stopped, we can safely reset the pending state. */
atomic_set(&pfdev->reset.pending, 0); atomic_set(&pfdev->reset.pending, 0);
spin_lock_irqsave(&pfdev->js->job_lock, flags); spin_lock(&pfdev->js->job_lock);
for (i = 0; i < NUM_JOB_SLOTS; i++) { for (i = 0; i < NUM_JOB_SLOTS; i++) {
if (pfdev->jobs[i]) { if (pfdev->jobs[i]) {
pm_runtime_put_noidle(pfdev->dev); pm_runtime_put_noidle(pfdev->dev);
@ -572,7 +592,7 @@ static void panfrost_reset(struct work_struct *work)
pfdev->jobs[i] = NULL; pfdev->jobs[i] = NULL;
} }
} }
spin_unlock_irqrestore(&pfdev->js->job_lock, flags); spin_unlock(&pfdev->js->job_lock);
panfrost_device_reset(pfdev); panfrost_device_reset(pfdev);
@ -599,8 +619,11 @@ int panfrost_job_init(struct panfrost_device *pfdev)
if (irq <= 0) if (irq <= 0)
return -ENODEV; return -ENODEV;
ret = devm_request_irq(pfdev->dev, irq, panfrost_job_irq_handler, ret = devm_request_threaded_irq(pfdev->dev, irq,
IRQF_SHARED, KBUILD_MODNAME "-job", pfdev); panfrost_job_irq_handler,
panfrost_job_irq_handler_thread,
IRQF_SHARED, KBUILD_MODNAME "-job",
pfdev);
if (ret) { if (ret) {
dev_err(pfdev->dev, "failed to request job irq"); dev_err(pfdev->dev, "failed to request job irq");
return ret; return ret;