From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Fri, 10 Jan 2014 09:28:09 +0000 (+0200)
Subject: drm/i915: Don't oops if the initial modeset fails
X-Git-Tag: v3.15-rc1~51^2~62^2~110
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d00a1f574842270515270ff27b86acde4e3d3c1;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed