drm/i915: avoid non-atomic sysrq execution (b66d18dd) · Commits · 戴 / test

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>

drivers/gpu/drm/i915/intel_fb.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -857,10 +857,16 @@ void intelfb_restore(void)
		drm_crtc_helper_set_config(&kernelfb_mode);
		}

		static void intelfb_sysrq(int dummy1, struct tty_struct *dummy3)
		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)
		{
		schedule_work(&intelfb_restore_work);
		}

		static struct sysrq_key_op sysrq_intelfb_restore_op = {
		.handler = intelfb_sysrq,

Admin message