diff options
| author | Clint Taylor | 2017-01-18 22:38:43 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-01-19 09:48:10 +0100 |
| commit | 5b8cd0755f8a06a851c436a013e7be0823fb155a (patch) | |
| tree | c23dd7b28a8a545dd187d45c74fd3a1091bd5550 /drivers/gpu/drm/i915/intel_fbdev.c | |
| parent | drm/i915: Avoid drm_atomic_state_put(NULL) on error paths (diff) | |
| download | kernel-qcow2-linux-5b8cd0755f8a06a851c436a013e7be0823fb155a.tar.gz kernel-qcow2-linux-5b8cd0755f8a06a851c436a013e7be0823fb155a.tar.xz kernel-qcow2-linux-5b8cd0755f8a06a851c436a013e7be0823fb155a.zip | |
drm/i915: prevent crash with .disable_display parameter
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 <chris@chris-wilson.co.uk>
Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1484775523-29428-1-git-send-email-clinton.a.taylor@intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: <stable@vger.kernel.org> # v4.8+
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index bdefa61f2e60..bb0e9bf80e45 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -742,6 +742,9 @@ void intel_fbdev_initial_config_async(struct drm_device *dev) { struct intel_fbdev *ifbdev = to_i915(dev)->fbdev; + if (!ifbdev) + return; + ifbdev->cookie = async_schedule(intel_fbdev_initial_config, ifbdev); } |