Revert "drm/i915: Make intel_display_suspend atomic, v2."

This reverts commit 490f400db5d886fc28566af69b02f6497f31be4b.

We're not ready yet to make it atomic, we calculate some state in
advance, but without atomic plane support atomic the hw readout will
fail.

It's required to revert this commit to revert the atomic hw
state readout patch.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90868
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90861
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Esse commit está contido em:
Maarten Lankhorst
2015-06-10 10:24:19 +02:00
commit de Jani Nikula
commit 9716c691ce
3 arquivos alterados com 14 adições e 48 exclusões

Ver arquivo

@@ -634,9 +634,6 @@ static int i915_drm_suspend(struct drm_device *dev)
intel_display_suspend(dev);
drm_modeset_unlock_all(dev);
/* suspending displays will unsets init power */
intel_display_set_init_power(dev_priv, true);
intel_dp_mst_suspend(dev);
intel_runtime_pm_disable_interrupts(dev_priv);