drm/i915: Remove ckey/format checks from skl_update_scaler_plane()

skl_plane_check() already takes care to reject scaling when an
unsupported pixel format or color keying is used. No need to
replicate that in the scaler code.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241016143134.26903-10-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c
index baa601d..7dbc99b 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_scaler.c
+++ b/drivers/gpu/drm/i915/display/skl_scaler.c
@@ -272,7 +272,6 @@ int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
                to_intel_plane(plane_state->uapi.plane);
        struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev);
        struct drm_framebuffer *fb = plane_state->hw.fb;
-       int ret;
        bool force_detach = !fb || !plane_state->uapi.visible;
        bool need_scaler = false;
 
@@ -281,72 +280,16 @@ int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
            fb && intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
                need_scaler = true;
 
-       ret = skl_update_scaler(crtc_state, force_detach,
-                               drm_plane_index(&intel_plane->base),
-                               &plane_state->scaler_id,
-                               drm_rect_width(&plane_state->uapi.src) >> 16,
-                               drm_rect_height(&plane_state->uapi.src) >> 16,
-                               drm_rect_width(&plane_state->uapi.dst),
-                               drm_rect_height(&plane_state->uapi.dst),
-                               fb ? fb->format : NULL,
-                               fb ? fb->modifier : 0,
-                               need_scaler);
-
-       if (ret || plane_state->scaler_id < 0)
-               return ret;
-
-       /* check colorkey */
-       if (plane_state->ckey.flags) {
-               drm_dbg_kms(&dev_priv->drm,
-                           "[PLANE:%d:%s] scaling with color key not allowed",
-                           intel_plane->base.base.id,
-                           intel_plane->base.name);
-               return -EINVAL;
-       }
-
-       /* Check src format */
-       switch (fb->format->format) {
-       case DRM_FORMAT_RGB565:
-       case DRM_FORMAT_XBGR8888:
-       case DRM_FORMAT_XRGB8888:
-       case DRM_FORMAT_ABGR8888:
-       case DRM_FORMAT_ARGB8888:
-       case DRM_FORMAT_XRGB2101010:
-       case DRM_FORMAT_XBGR2101010:
-       case DRM_FORMAT_ARGB2101010:
-       case DRM_FORMAT_ABGR2101010:
-       case DRM_FORMAT_YUYV:
-       case DRM_FORMAT_YVYU:
-       case DRM_FORMAT_UYVY:
-       case DRM_FORMAT_VYUY:
-       case DRM_FORMAT_NV12:
-       case DRM_FORMAT_XYUV8888:
-       case DRM_FORMAT_P010:
-       case DRM_FORMAT_P012:
-       case DRM_FORMAT_P016:
-       case DRM_FORMAT_Y210:
-       case DRM_FORMAT_Y212:
-       case DRM_FORMAT_Y216:
-       case DRM_FORMAT_XVYU2101010:
-       case DRM_FORMAT_XVYU12_16161616:
-       case DRM_FORMAT_XVYU16161616:
-               break;
-       case DRM_FORMAT_XBGR16161616F:
-       case DRM_FORMAT_ABGR16161616F:
-       case DRM_FORMAT_XRGB16161616F:
-       case DRM_FORMAT_ARGB16161616F:
-               if (DISPLAY_VER(dev_priv) >= 11)
-                       break;
-               fallthrough;
-       default:
-               drm_dbg_kms(&dev_priv->drm,
-                           "[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",
-                           intel_plane->base.base.id, intel_plane->base.name,
-                           fb->base.id, fb->format->format);
-               return -EINVAL;
-       }
-
-       return 0;
+       return skl_update_scaler(crtc_state, force_detach,
+                                drm_plane_index(&intel_plane->base),
+                                &plane_state->scaler_id,
+                                drm_rect_width(&plane_state->uapi.src) >> 16,
+                                drm_rect_height(&plane_state->uapi.src) >> 16,
+                                drm_rect_width(&plane_state->uapi.dst),
+                                drm_rect_height(&plane_state->uapi.dst),
+                                fb ? fb->format : NULL,
+                                fb ? fb->modifier : 0,
+                                need_scaler);
 }
 
 static int intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,