diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-05-15 23:11:48 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-05 16:22:33 +0200 |
| commit | b66d18ddb16603d1e1ec39cb2ff3abf3fd212180 (patch) | |
| tree | 4328633189eae071e2e2a43a4406ecff477c3a90 /drivers/gpu/drm/i915/intel_fb.c | |
| parent | drm/i915: apply G45 vblank count code to all G4x chips and fix max_frame_count (diff) | |
| download | linux-b66d18ddb16603d1e1ec39cb2ff3abf3fd212180.tar.xz linux-b66d18ddb16603d1e1ec39cb2ff3abf3fd212180.zip | |
drm/i915: avoid non-atomic sysrq execution
The sysrq functions are executed in hardirq context, so we shouldn't be
calling sleeping functions from them, like mutex_locks or memory
allocations.
Fix up the i915 sysrq handler to avoid this.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fb.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index e4652dcdd9bb..7a66b91ccf42 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -857,9 +857,15 @@ void intelfb_restore(void) drm_crtc_helper_set_config(&kernelfb_mode); } +static void intelfb_restore_work_fn(struct work_struct *ignored) +{ + intelfb_restore(); +} +static DECLARE_WORK(intelfb_restore_work, intelfb_restore_work_fn); + static void intelfb_sysrq(int dummy1, struct tty_struct *dummy3) { - intelfb_restore(); + schedule_work(&intelfb_restore_work); } static struct sysrq_key_op sysrq_intelfb_restore_op = { |