]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Don't oops if the initial modeset fails
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 10 Jan 2014 09:28:09 +0000 (11:28 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 24 Jan 2014 16:22:42 +0000 (17:22 +0100)
commit2270b1546d6d483cdeb0fd929d55eab4d95b9a2b
treed12c47fc9247f2508836bdc485aa3750df4991a7
parent023fb4e3a3ad6cb106edbc8bda6cdc674973f1ee
drm/i915: Don't oops if the initial modeset fails

If the first modeset operation fails, we will attempt to restore the
previous configuration that we read out from the hardware. But as we
don't yet reconstruct the framebuffer information, we end up calling
the modeset code with an enabled crtc but with fb==NULL. This will
lead to an oops within the modeset code.

Check for NULL fb when restoring the configuration, and instead of
oopsing simply disable the pipe.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c