Skip to contentSkip to conversation

Patch "drm/i915: prevent crash with .disable_display parameter" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 30, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

drm/i915: prevent crash with .disable_display parameter

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-i915-prevent-crash-with-.disable_display-parameter.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 27892bbdc9233f33bf0f44e08aab8f12e0dec142 Mon Sep 17 00:00:00 2001

From: Clint Taylor <[email protected]>
Date: Wed, 18 Jan 2017 13:38:43 -0800
Subject: drm/i915: prevent crash with .disable_display parameter

From: Clint Taylor <[email protected]>

commit 27892bbdc9233f33bf0f44e08aab8f12e0dec142 upstream.

The .disable_display parameter was causing a fatal crash when fbdev was dereferenced during driver init.

V1: protection in i915_drv.c
V2: Moved protection to intel_fbdev.c

Fixes 43cee314345a ("drm/i915/fbdev: Limit the global async-domain synchronization")

Testcase: igt/drv_module_reload/basic-no-display

Cc Chris Wilson <[email protected]>
Cc Lukas Wunner <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Jani Nikula <[email protected]>
(cherry picked from commit 5b8cd0755f8a06a851c436a013e7be0823fb155a)
---
 drivers/gpu/drm/i915/intel_fbdev.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_fbdev.c +3 -0
@@ -745,6 +745,9 @@ void intel_fbdev_initial_config_async(st
 {
 	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;
 
+	if (!ifbdev)
+		return;
+
 	ifbdev->cookie = async_schedule(intel_fbdev_initial_config, ifbdev);
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/drm-i915-prevent-crash-with-.disable_display-parameter.patch