drm/i915: Update load-detect failure paths for modeset-rework
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 5 Nov 2012 22:25:08 +0000 (22:25 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 11 Nov 2012 22:51:47 +0000 (23:51 +0100)
commit0e8b3d3ea7c8f6e65c2c7220d64cbeb78023eff4
tree57a391d158893b50881aea4e6be63f58d370c63f
parent0fed39bd1d85bfd0d454cb7ba2aedab2f15141d5
drm/i915: Update load-detect failure paths for modeset-rework

After the rework, intel_set_mode() became a little better behaved in
restoring the current mode if we failed to apply the requested modeline.
However, the failure path for load-detect would clobber the existing
state, leading to an oops during BIOS takeover on older machines.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c