drm/i915: Don't reject primary plane windowing with color keying enabled on SKL+
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 15 Jan 2016 18:46:53 +0000 (20:46 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 29 Jan 2016 07:12:58 +0000 (09:12 +0200)
commit6f94b6dd006909a5ef6435cc0af557e945240f48
tree7f30aff6a58139ac6a4ca365f63e6fc6de1393f3
parent5efd407674068dede403551bea3b0b134c32513a
drm/i915: Don't reject primary plane windowing with color keying enabled on SKL+

On SKL+ plane scaling is mutually exclusive with color keying. The code
check for this, but during some refactoring the code got changed to
also reject primary plane windowing when color keying is used. There is
no such restriction in the hardware, so restore the original logic.

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: 061e4b8d650a ("drm/i915: clean up atomic plane check functions, v2.")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452883613-28549-1-git-send-email-ville.syrjala@linux.intel.com
Cc: stable@vger.kernel.org
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
(cherry picked from commit 693bdc28a733dba68b86af295e7509812fec35d9)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c