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>

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ccb3e3f47450..9b6e726666c3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14019,11 +14019,12 @@ intel_check_primary_plane(struct drm_plane *plane,
         int max_scale = DRM_PLANE_HELPER_NO_SCALING;
         bool can_position = false;
 
-        /* use scaler when colorkey is not required */
-        if (INTEL_INFO(plane->dev)->gen >= 9 &&
-            state->ckey.flags == I915_SET_COLORKEY_NONE) {
-                min_scale = 1;
-                max_scale = skl_max_scale(to_intel_crtc(crtc), crtc_state);
+        if (INTEL_INFO(plane->dev)->gen >= 9) {
+                /* use scaler when colorkey is not required */
+                if (state->ckey.flags == I915_SET_COLORKEY_NONE) {
+                        min_scale = 1;
+                        max_scale = skl_max_scale(to_intel_crtc(crtc), crtc_state);
+                }
                 can_position = true;
         }