diff options
author | Tejun Heo <tj@kernel.org> | 2011-01-03 08:49:32 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-01-05 23:32:16 -0500 |
commit | 32c87fca2fac490e34a9fa900b45f2fbb4faacf9 (patch) | |
tree | 181e9c1d1493124f0a0f5a8a65be4bf29053b77e /drivers/gpu/drm/radeon/radeon.h | |
parent | af5dd83b873efd4e1477f2265b6fa15a825aff26 (diff) |
drm/radeon: use system_wq instead of dev_priv->wq
With cmwq, there's no reason for radeon to use a dedicated workqueue.
Drop dev_priv->wq and use system_wq instead.
Because radeon_driver_irq_uninstall_kms() may be called from
unsleepable context, the work items can't be flushed from there.
Instead, init and flush from radeon_irq_kms_init/fini().
While at it, simplify canceling/flushing of rdev->pm.dynpm_idle_work.
Always initialize and sync cancel instead of being unnecessarily smart
about it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Alex Deucher <alexdeucher@gmail.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index a835d95021d1..aff8080026a1 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -1152,7 +1152,6 @@ struct radeon_device { | |||
1152 | struct r700_vram_scratch vram_scratch; | 1152 | struct r700_vram_scratch vram_scratch; |
1153 | int msi_enabled; /* msi enabled */ | 1153 | int msi_enabled; /* msi enabled */ |
1154 | struct r600_ih ih; /* r6/700 interrupt ring */ | 1154 | struct r600_ih ih; /* r6/700 interrupt ring */ |
1155 | struct workqueue_struct *wq; | ||
1156 | struct work_struct hotplug_work; | 1155 | struct work_struct hotplug_work; |
1157 | int num_crtc; /* number of crtcs */ | 1156 | int num_crtc; /* number of crtcs */ |
1158 | struct mutex dc_hw_i2c_mutex; /* display controller hw i2c mutex */ | 1157 | struct mutex dc_hw_i2c_mutex; /* display controller hw i2c mutex */ |