UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpu: host1x: hw: intr_hw: Remove create_workqueue 

System workqueues have been able to handle high level of concurrency
for a long time now and there's no reason to use dedicated workqueues
just to gain concurrency. Since the workqueue host->intr_wq is involved
in sync point interrupts, and sync point wait and is not being used on
a memory reclaim path, dedicated host->intr_wq has been replaced with the
use of system_wq.

Unlike a dedicated per-cpu workqueue created with create_workqueue(),
system_wq allows multiple work items to overlap executions even on
the same CPU; however, a per-cpu workqueue doesn't have any CPU
locality or global ordering guarantees unless the target CPU is
explicitly specified and thus the increase of local concurrency
shouldn't make any difference.

cancel_work_sync() has been used  in _host1x_free_syncpt_irq() to ensure
that no work is pending by the time exit path runs.

Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Bhaktipriya Shridhar 2016-06-18 14:36:32 +05:30 committed by Thierry Reding
parent dfa7573e84
commit 57574bd779
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/host1x/dev.h
View File

@ -109,7 +109,6 @@ struct host1x {
struct clk *clk; struct clk *clk;
struct mutex intr_mutex; struct mutex intr_mutex;
struct workqueue_struct *intr_wq;
int intr_syncpt_irq; int intr_syncpt_irq;
const struct host1x_syncpt_ops *syncpt_op; const struct host1x_syncpt_ops *syncpt_op;

8
drivers/gpu/host1x/hw/intr_hw.c
View File

@ -38,7 +38,7 @@ static void host1x_intr_syncpt_handle(struct host1x_syncpt *syncpt)
host1x_sync_writel(host, BIT_MASK(id), host1x_sync_writel(host, BIT_MASK(id),
HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(BIT_WORD(id))); HOST1X_SYNC_SYNCPT_THRESH_CPU0_INT_STATUS(BIT_WORD(id)));
queue_work(host->intr_wq, &syncpt->intr.work); schedule_work(&syncpt->intr.work);
} }
static irqreturn_t syncpt_thresh_isr(int irq, void *dev_id) static irqreturn_t syncpt_thresh_isr(int irq, void *dev_id)
@ -127,8 +127,12 @@ static void _host1x_intr_disable_syncpt_intr(struct host1x *host, u32 id)
static int _host1x_free_syncpt_irq(struct host1x *host) static int _host1x_free_syncpt_irq(struct host1x *host)
{ {
int i;
devm_free_irq(host->dev, host->intr_syncpt_irq, host); devm_free_irq(host->dev, host->intr_syncpt_irq, host);
flush_workqueue(host->intr_wq);
for (i = 0; i < host->info->nb_pts; i++)
cancel_work_sync(&host->syncpt[i].intr.work);
return 0; return 0;
} }

4
drivers/gpu/host1x/intr.c
View File

@ -277,9 +277,6 @@ int host1x_intr_init(struct host1x *host, unsigned int irq_sync)
mutex_init(&host->intr_mutex); mutex_init(&host->intr_mutex);
host->intr_syncpt_irq = irq_sync; host->intr_syncpt_irq = irq_sync;
host->intr_wq = create_workqueue("host_syncpt");
if (!host->intr_wq)
return -ENOMEM;
for (id = 0; id < nb_pts; ++id) { for (id = 0; id < nb_pts; ++id) {
struct host1x_syncpt *syncpt = host->syncpt + id; struct host1x_syncpt *syncpt = host->syncpt + id;
@ -299,7 +296,6 @@ int host1x_intr_init(struct host1x *host, unsigned int irq_sync)
void host1x_intr_deinit(struct host1x *host) void host1x_intr_deinit(struct host1x *host)
{ {
host1x_intr_stop(host); host1x_intr_stop(host);
destroy_workqueue(host->intr_wq);
} }
void host1x_intr_start(struct host1x *host) void host1x_intr_start(struct host1x *host)