drm/i915: Don't update staged config during force restore modesets
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Tue, 16 Jun 2015 08:49:44 +0000 (11:49 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 17 Jun 2015 11:20:54 +0000 (14:20 +0300)
commit0d26fb891a119d78d8e4b345cfd0be0f2112cb7a
tree1f328ed935305553d5a2010a155f6b9f7b0b0182
parente62d8dc0aa9f7493bcee3cbc4bf666a23a2d2f17
drm/i915: Don't update staged config during force restore modesets

The force restore path relies on the staged config to preserve the
configuration used before a suspend/resume cycle. The update done to it
in intel_modeset_fixup_state() would cause that information to be lost
after the first modeset, making it impossible to restore the modes for
pipes B and C.

References: https://bugs.freedesktop.org/show_bug.cgi?id=90468
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c