Commit b66d18dd authored by Jesse Barnes's avatar Jesse Barnes Committed by Eric Anholt

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: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 42c2798b
...@@ -857,9 +857,15 @@ void intelfb_restore(void) ...@@ -857,9 +857,15 @@ void intelfb_restore(void)
drm_crtc_helper_set_config(&kernelfb_mode); 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) 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 = { static struct sysrq_key_op sysrq_intelfb_restore_op = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment