From: Tejun Heo <tj@kernel.org> To: linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, David Airlie <airlied@linux.ie>, dri-devel@lists.freedesktop.org Subject: [PATCH 08/32] drm/nouveau: use system_wq instead of dev_priv->wq Date: Mon, 3 Jan 2011 14:49:31 +0100 [thread overview] Message-ID: <1294062595-30097-9-git-send-email-tj@kernel.org> (raw) In-Reply-To: <1294062595-30097-1-git-send-email-tj@kernel.org> With cmwq, there's no reason for nouveau to use a dedicated workqueue. Drop dev_priv->wq and use system_wq instead. Because nouveau_irq_uninstall() may be called from unsleepable context, the work items can't be flushed from there. Instead, init and flush from nouveau_load/unload(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc: David Airlie <airlied@linux.ie> Cc: dri-devel@lists.freedesktop.org --- Only compile tested. Please feel free to take it into the subsystem tree or simply ack - I'll route it through the wq tree. Thanks. drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - drivers/gpu/drm/nouveau/nouveau_irq.c | 9 --------- drivers/gpu/drm/nouveau/nouveau_state.c | 19 ++++++++++--------- drivers/gpu/drm/nouveau/nv50_display.c | 4 ++-- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 1c7db64..2ecf875 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -580,7 +580,6 @@ struct drm_nouveau_private { struct nouveau_bo *vga_ram; - struct workqueue_struct *wq; struct work_struct irq_work; struct work_struct hpd_work; diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c index 7bfd9e6..7d05a06 100644 --- a/drivers/gpu/drm/nouveau/nouveau_irq.c +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c @@ -52,17 +52,8 @@ static int nouveau_ratelimit(void) void nouveau_irq_preinstall(struct drm_device *dev) { - struct drm_nouveau_private *dev_priv = dev->dev_private; - /* Master disable */ nv_wr32(dev, NV03_PMC_INTR_EN_0, 0); - - if (dev_priv->card_type >= NV_50) { - INIT_WORK(&dev_priv->irq_work, nv50_display_irq_handler_bh); - INIT_WORK(&dev_priv->hpd_work, nv50_display_irq_hotplug_bh); - spin_lock_init(&dev_priv->hpd_state.lock); - INIT_LIST_HEAD(&dev_priv->vbl_waiting); - } } int diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 049f755..2eea6ea 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -839,17 +839,17 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) dev->dev_private = dev_priv; dev_priv->dev = dev; + /* the followings are used only by >= NV_50 */ + INIT_WORK(&dev_priv->irq_work, nv50_display_irq_handler_bh); + INIT_WORK(&dev_priv->hpd_work, nv50_display_irq_hotplug_bh); + spin_lock_init(&dev_priv->hpd_state.lock); + INIT_LIST_HEAD(&dev_priv->vbl_waiting); + dev_priv->flags = flags & NOUVEAU_FLAGS; NV_DEBUG(dev, "vendor: 0x%X device: 0x%X class: 0x%X\n", dev->pci_vendor, dev->pci_device, dev->pdev->class); - dev_priv->wq = create_workqueue("nouveau"); - if (!dev_priv->wq) { - ret = -EINVAL; - goto err_priv; - } - /* resource 0 is mmio regs */ /* resource 1 is linear FB */ /* resource 2 is RAMIN (mmio regs + 0x1000000) */ @@ -862,7 +862,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) NV_ERROR(dev, "Unable to initialize the mmio mapping. " "Please report your setup to " DRIVER_EMAIL "\n"); ret = -EINVAL; - goto err_wq; + goto err_priv; } NV_DEBUG(dev, "regs mapped ok at 0x%llx\n", (unsigned long long)mmio_start_offs); @@ -969,8 +969,6 @@ err_ramin: iounmap(dev_priv->ramin); err_mmio: iounmap(dev_priv->mmio); -err_wq: - destroy_workqueue(dev_priv->wq); err_priv: kfree(dev_priv); dev->dev_private = NULL; @@ -992,6 +990,9 @@ int nouveau_unload(struct drm_device *dev) engine->display.destroy(dev); nouveau_card_takedown(dev); + flush_work_sync(&dev_priv->irq_work); + flush_work_sync(&dev_priv->hpd_work); + iounmap(dev_priv->mmio); iounmap(dev_priv->ramin); diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index f624c61..3d569da 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -1110,7 +1110,7 @@ nv50_display_irq_handler(struct drm_device *dev) dev_priv->hpd_state.hpd1_bits |= hpd1_bits; spin_unlock(&dev_priv->hpd_state.lock); - queue_work(dev_priv->wq, &dev_priv->hpd_work); + schedule_work(&dev_priv->hpd_work); } while (nv_rd32(dev, NV50_PMC_INTR_0) & NV50_PMC_INTR_0_DISPLAY) { @@ -1139,7 +1139,7 @@ nv50_display_irq_handler(struct drm_device *dev) if (clock) { nv_wr32(dev, NV03_PMC_INTR_EN_0, 0); if (!work_pending(&dev_priv->irq_work)) - queue_work(dev_priv->wq, &dev_priv->irq_work); + schedule_work(&dev_priv->irq_work); delayed |= clock; intr1 &= ~clock; } -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org> To: linux-kernel@vger.kernel.org Cc: Tejun Heo <tj@kernel.org>, dri-devel@lists.freedesktop.org Subject: [PATCH 08/32] drm/nouveau: use system_wq instead of dev_priv->wq Date: Mon, 3 Jan 2011 14:49:31 +0100 [thread overview] Message-ID: <1294062595-30097-9-git-send-email-tj@kernel.org> (raw) In-Reply-To: <1294062595-30097-1-git-send-email-tj@kernel.org> With cmwq, there's no reason for nouveau to use a dedicated workqueue. Drop dev_priv->wq and use system_wq instead. Because nouveau_irq_uninstall() may be called from unsleepable context, the work items can't be flushed from there. Instead, init and flush from nouveau_load/unload(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc: David Airlie <airlied@linux.ie> Cc: dri-devel@lists.freedesktop.org --- Only compile tested. Please feel free to take it into the subsystem tree or simply ack - I'll route it through the wq tree. Thanks. drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - drivers/gpu/drm/nouveau/nouveau_irq.c | 9 --------- drivers/gpu/drm/nouveau/nouveau_state.c | 19 ++++++++++--------- drivers/gpu/drm/nouveau/nv50_display.c | 4 ++-- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 1c7db64..2ecf875 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -580,7 +580,6 @@ struct drm_nouveau_private { struct nouveau_bo *vga_ram; - struct workqueue_struct *wq; struct work_struct irq_work; struct work_struct hpd_work; diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c index 7bfd9e6..7d05a06 100644 --- a/drivers/gpu/drm/nouveau/nouveau_irq.c +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c @@ -52,17 +52,8 @@ static int nouveau_ratelimit(void) void nouveau_irq_preinstall(struct drm_device *dev) { - struct drm_nouveau_private *dev_priv = dev->dev_private; - /* Master disable */ nv_wr32(dev, NV03_PMC_INTR_EN_0, 0); - - if (dev_priv->card_type >= NV_50) { - INIT_WORK(&dev_priv->irq_work, nv50_display_irq_handler_bh); - INIT_WORK(&dev_priv->hpd_work, nv50_display_irq_hotplug_bh); - spin_lock_init(&dev_priv->hpd_state.lock); - INIT_LIST_HEAD(&dev_priv->vbl_waiting); - } } int diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 049f755..2eea6ea 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -839,17 +839,17 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) dev->dev_private = dev_priv; dev_priv->dev = dev; + /* the followings are used only by >= NV_50 */ + INIT_WORK(&dev_priv->irq_work, nv50_display_irq_handler_bh); + INIT_WORK(&dev_priv->hpd_work, nv50_display_irq_hotplug_bh); + spin_lock_init(&dev_priv->hpd_state.lock); + INIT_LIST_HEAD(&dev_priv->vbl_waiting); + dev_priv->flags = flags & NOUVEAU_FLAGS; NV_DEBUG(dev, "vendor: 0x%X device: 0x%X class: 0x%X\n", dev->pci_vendor, dev->pci_device, dev->pdev->class); - dev_priv->wq = create_workqueue("nouveau"); - if (!dev_priv->wq) { - ret = -EINVAL; - goto err_priv; - } - /* resource 0 is mmio regs */ /* resource 1 is linear FB */ /* resource 2 is RAMIN (mmio regs + 0x1000000) */ @@ -862,7 +862,7 @@ int nouveau_load(struct drm_device *dev, unsigned long flags) NV_ERROR(dev, "Unable to initialize the mmio mapping. " "Please report your setup to " DRIVER_EMAIL "\n"); ret = -EINVAL; - goto err_wq; + goto err_priv; } NV_DEBUG(dev, "regs mapped ok at 0x%llx\n", (unsigned long long)mmio_start_offs); @@ -969,8 +969,6 @@ err_ramin: iounmap(dev_priv->ramin); err_mmio: iounmap(dev_priv->mmio); -err_wq: - destroy_workqueue(dev_priv->wq); err_priv: kfree(dev_priv); dev->dev_private = NULL; @@ -992,6 +990,9 @@ int nouveau_unload(struct drm_device *dev) engine->display.destroy(dev); nouveau_card_takedown(dev); + flush_work_sync(&dev_priv->irq_work); + flush_work_sync(&dev_priv->hpd_work); + iounmap(dev_priv->mmio); iounmap(dev_priv->ramin); diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index f624c61..3d569da 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -1110,7 +1110,7 @@ nv50_display_irq_handler(struct drm_device *dev) dev_priv->hpd_state.hpd1_bits |= hpd1_bits; spin_unlock(&dev_priv->hpd_state.lock); - queue_work(dev_priv->wq, &dev_priv->hpd_work); + schedule_work(&dev_priv->hpd_work); } while (nv_rd32(dev, NV50_PMC_INTR_0) & NV50_PMC_INTR_0_DISPLAY) { @@ -1139,7 +1139,7 @@ nv50_display_irq_handler(struct drm_device *dev) if (clock) { nv_wr32(dev, NV03_PMC_INTR_EN_0, 0); if (!work_pending(&dev_priv->irq_work)) - queue_work(dev_priv->wq, &dev_priv->irq_work); + schedule_work(&dev_priv->irq_work); delayed |= clock; intr1 &= ~clock; } -- 1.7.1
next prev parent reply other threads:[~2011-01-03 13:50 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-01-03 13:49 [PATCHSET] workqueue: update workqueue users - replace create_workqueue() Tejun Heo 2011-01-03 13:49 ` [PATCH 01/32] arm/omap: use system_wq in mailbox Tejun Heo 2011-01-03 21:35 ` Kanigeri, Hari 2011-01-04 5:24 ` Tejun Heo 2011-01-25 13:47 ` Tejun Heo 2011-01-25 15:34 ` Hari Kanigeri 2011-01-25 15:34 ` Hari Kanigeri 2011-01-25 15:37 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 02/32] powerpc/cell: use system_wq in cpufreq_spudemand Tejun Heo 2011-01-03 13:49 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 03/32] block: make kblockd_workqueue smarter Tejun Heo 2011-01-03 14:00 ` Jens Axboe 2011-01-03 13:49 ` [PATCH 04/32] bio-integrity: mark kintegrityd_wq highpri and CPU intensive Tejun Heo 2011-01-03 13:49 ` [PATCH 05/32] crypto: mark crypto workqueues CPU_INTENSIVE Tejun Heo 2011-01-03 13:49 ` Tejun Heo 2011-01-04 4:38 ` Herbert Xu 2011-01-04 4:38 ` Herbert Xu 2011-01-03 13:49 ` [PATCH 06/32] acpi: kacpi*_wq don't need WQ_MEM_RECLAIM Tejun Heo 2011-01-03 13:49 ` [PATCH 07/32] cpufreq: use system_wq instead of dedicated workqueues Tejun Heo 2011-01-03 13:49 ` Tejun Heo [this message] 2011-01-03 13:49 ` [PATCH 08/32] drm/nouveau: use system_wq instead of dev_priv->wq Tejun Heo 2011-01-05 1:07 ` Ben Skeggs 2011-01-05 1:16 ` Ben Skeggs 2011-01-06 17:29 ` Tejun Heo 2011-01-26 16:49 ` [PATCH UPDATED " Tejun Heo 2011-02-01 10:41 ` Tejun Heo 2011-02-04 1:53 ` Ben Skeggs 2011-02-04 11:03 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 09/32] drm/radeon: " Tejun Heo 2011-01-03 13:49 ` Tejun Heo 2011-01-05 0:21 ` Alex Deucher 2011-01-06 4:31 ` Dave Airlie 2011-01-03 13:49 ` [PATCH 10/32] input/tps6507x-ts: use system_wq instead of dedicated workqueue Tejun Heo 2011-01-03 14:39 ` Dan Carpenter 2011-01-03 16:34 ` Todd Fischer 2011-01-25 14:19 ` Tejun Heo 2011-01-25 16:13 ` Todd Fischer 2011-01-25 16:50 ` Dmitry Torokhov 2011-01-26 10:43 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 11/32] v4l/cx18: update workqueue usage Tejun Heo 2011-01-04 0:54 ` Andy Walls 2011-01-04 8:36 ` Tejun Heo 2011-01-04 13:21 ` Andy Walls 2011-01-08 17:03 ` Andy Walls 2011-01-03 13:49 ` [PATCH 12/32] i2o: use alloc_workqueue() instead of create_workqueue() Tejun Heo 2011-01-03 13:49 ` [PATCH 13/32] misc/iwmc3200top: use system_wq instead of dedicated workqueues Tejun Heo 2011-01-03 13:49 ` [PATCH 14/32] wireless/ipw2x00: " Tejun Heo 2011-01-06 20:51 ` John W. Linville 2011-01-03 13:49 ` [PATCH 15/32] wireless/libertas[_tf]: " Tejun Heo 2011-02-01 10:52 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 16/32] scsi/be2iscsi,qla2xxx: convert to alloc_workqueue() Tejun Heo 2011-02-01 23:45 ` Mike Christie 2011-02-02 10:25 ` Tejun Heo 2011-02-02 20:41 ` Mike Christie 2011-02-03 9:31 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 17/32] scsi/ibmvstgt: use system_wq instead of vtgtd workqueue Tejun Heo 2011-01-03 17:45 ` Bart Van Assche 2011-01-04 5:20 ` Tejun Heo 2011-01-24 16:09 ` Bart Van Assche 2011-01-24 16:24 ` Tejun Heo 2011-02-01 10:40 ` Tejun Heo 2011-02-01 14:18 ` FUJITA Tomonori 2011-02-01 14:25 ` James Bottomley 2011-02-01 14:29 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 18/32] scsi/scsi_tgt_lib: scsi_tgtd isn't used in memory reclaim path Tejun Heo 2011-01-03 13:49 ` [PATCH 19/32] usb/ueagle-atm: use system_wq instead of dedicated workqueues Tejun Heo 2011-01-03 13:49 ` [PATCH 20/32] video/msm_fb: " Tejun Heo [not found] ` <1294062595-30097-21-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 2011-01-03 17:06 ` Stanislaw Gruszka 2011-01-03 17:06 ` Stanislaw Gruszka [not found] ` <20110103170615.GB2285-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2011-01-03 18:10 ` Daniel Walker 2011-01-03 18:10 ` Daniel Walker [not found] ` <1294078245.18295.5.camel-y5Owza0q8UhBVvN7MMdr1KRtKmQZhJ7pQQ4Iyu8u01E@public.gmane.org> 2011-01-25 13:45 ` Tejun Heo 2011-01-25 13:45 ` Tejun Heo [not found] ` <20110125134558.GY27510-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org> 2011-01-25 18:00 ` Daniel Walker 2011-01-25 18:00 ` Daniel Walker 2011-01-25 19:14 ` David Brown 2011-01-25 19:16 ` Daniel Walker [not found] ` <1295982976.25496.29.camel-y5Owza0q8UhBVvN7MMdr1KRtKmQZhJ7pQQ4Iyu8u01E@public.gmane.org> 2011-01-25 22:08 ` Carl Vanderlip 2011-01-25 22:08 ` Carl Vanderlip 2011-01-25 23:21 ` David Brown 2011-01-26 10:41 ` Tejun Heo 2011-01-26 18:04 ` David Brown 2011-01-03 13:49 ` [PATCH 21/32] fs/aio: aio_wq isn't used in memory reclaim path Tejun Heo 2011-01-04 15:56 ` Jeff Moyer 2011-01-05 11:28 ` Tejun Heo 2011-01-05 14:50 ` Jeff Moyer 2011-01-05 15:00 ` Benjamin LaHaise 2011-01-05 15:49 ` Jeff Moyer 2011-01-26 11:21 ` [PATCH UPDATED " Tejun Heo 2011-01-26 16:29 ` Jeff Moyer 2011-01-26 16:38 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 22/32] ceph: fsc->*_wq's aren't " Tejun Heo 2011-01-03 17:58 ` Sage Weil 2011-01-03 13:49 ` [PATCH 23/32] net/ceph: make ceph_msgr_wq non-reentrant Tejun Heo 2011-01-03 17:58 ` Sage Weil 2011-01-03 13:49 ` [PATCH 24/32] dlm: dlm workqueues aren't used in memory reclaim path Tejun Heo 2011-01-03 13:58 ` Steven Whitehouse 2011-01-03 13:58 ` [Cluster-devel] " Steven Whitehouse 2011-01-03 14:01 ` Tejun Heo 2011-01-03 14:21 ` Steven Whitehouse 2011-01-03 14:21 ` [Cluster-devel] " Steven Whitehouse 2011-01-03 14:27 ` Tejun Heo 2011-01-03 14:39 ` Steven Whitehouse 2011-01-03 14:39 ` [Cluster-devel] " Steven Whitehouse 2011-01-03 14:44 ` Tejun Heo 2011-01-03 13:49 ` [PATCH 25/32] ext4: convert to alloc_workqueue() Tejun Heo 2011-01-03 13:49 ` [PATCH 26/32] ocfs2: use system_wq instead of ocfs2_quota_wq Tejun Heo 2011-01-03 13:49 ` [PATCH 27/32] reiserfs: make commit_wq use the default concurrency level Tejun Heo 2011-01-03 13:49 ` [PATCH 28/32] xfs: convert to alloc_workqueue() Tejun Heo 2011-01-03 13:49 ` [PATCH 29/32] net/9p: use system_wq instead of p9_mux_wq Tejun Heo 2011-01-03 13:49 ` [PATCH 30/32] net/9p: replace p9_poll_task with a work Tejun Heo 2011-01-03 13:49 ` [PATCH 31/32] rds/ib: use system_wq instead of rds_ib_fmr_wq Tejun Heo 2011-01-03 13:49 ` [PATCH 32/32] rxrpc: rxrpc_workqueue isn't used during memory reclaim Tejun Heo 2011-01-25 14:29 ` [PATCHSET] workqueue: update workqueue users - replace create_workqueue() Tejun Heo 2011-01-25 16:26 ` Dave Jones 2011-01-26 10:40 ` Tejun Heo 2011-01-25 17:47 ` Madhu Iyengar 2011-01-26 4:46 ` Greg KH 2011-02-01 10:44 ` Tejun Heo
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=1294062595-30097-9-git-send-email-tj@kernel.org \ --to=tj@kernel.org \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.