drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 10 Sep 2015 15:59:08 +0000 (18:59 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 14 Oct 2015 10:43:25 +0000 (13:43 +0300)
commit0836e6d8c47416d6eb60bb68a5d7213c0c2d0d29
treea066126c44f35c23136935fd5c03cfb4ddb94008
parentc4816c7389d8dbcad036be7e5a34584289d9f590
drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()

Move the sprite/cursor plane disabling to occur in intel_sanitize_crtc()
where it belongs instead of doing it in intel_modeset_readout_hw_state().

The plane disabling was first added in
4cf0ebbd4fafbdf8e6431dbb315e5511c3efdc3b drm/i915: Rework plane readout.

I got the idea from some patches from Partik and/or Maarten but those
moved also the plane state readout to intel_sanitize_crtc() which isn't
quite right in my opinion.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=91910
Reviewed-by: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[Jani: cherry-picked from -next to v4.3]
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c