Revert "drm/i915: Make intel_display_suspend atomic, v2."
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 10 Jun 2015 08:24:19 +0000 (10:24 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 12 Jun 2015 10:19:35 +0000 (13:19 +0300)
commit9716c691ce06b043d3e75c8ff93704cb40c52265
treeef04aa9be6be472ceb2212009af2ad387bb28502
parent5c2db1882ab32546c46318d9feb017673c072717
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>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h