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)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 18 Jan 2016 14:07:43 +0000 (16:07 +0200)
commit693bdc28a733dba68b86af295e7509812fec35d9
treed5ff3b597abf03b330af6d42ed03f533c121ae1f
parenta9d8adad731171559b24eb27c9db4a64238b7ef0
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>
drivers/gpu/drm/i915/intel_display.c