]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - drivers/gpu/drm/i915/intel_display.c
drm/i915: Don't set enabled value of all CRTCs when restoring the mode
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Tue, 16 Jun 2015 08:49:45 +0000 (11:49 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 17 Jun 2015 11:21:01 +0000 (14:21 +0300)
commit4ed9fb371ccdfe465bd3bbb69e4cad5243e6c4e2
tree03d2605887cad927ed14d70868cd9114dfadcc61
parent0d26fb891a119d78d8e4b345cfd0be0f2112cb7a
drm/i915: Don't set enabled value of all CRTCs when restoring the mode

The code in intel_crtc_restore_mode() sets the enabled value of all the
CRTCs when restoring the mode after a suspend/resume cycle. When more
than one CRTC is enabled, that causes drm_atomic_helper_check_modeset()
to fail if there is more than one pipe enabled, since all but one CRTC
has valid connector data. Instead, set only the enabled value for the
CRTC passed as an argument.

v2: Don't leak atomic state. (Matt)

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