From: Dave Airlie <[email protected]>

rework the plane init calls to do the gen test one level higher.

Signed-off-by: Dave Airlie <[email protected]>
---
 drivers/gpu/drm/i915/Makefile                 |    1 +
 drivers/gpu/drm/i915/display/intel_crtc.c     |   16 +-
 .../gpu/drm/i915/display/intel_gen9_plane.c   | 1427 +++++++++++++++++
 drivers/gpu/drm/i915/display/intel_sprite.c   | 1417 +---------------
 4 files changed, 1449 insertions(+), 1412 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_gen9_plane.c

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index d6003b676f0d..eb56fe154c77 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -210,6 +210,7 @@ i915-y += \
        display/intel_fifo_underrun.o \
        display/intel_frontbuffer.o \
        display/intel_global_state.o \
+       display/intel_gen9_plane.o \
        display/intel_hdcp.o \
        display/intel_hotplug.o \
        display/intel_lpe_audio.o \
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c 
b/drivers/gpu/drm/i915/display/intel_crtc.c
index 75a79f18cee2..f12c1ddc8d56 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -615,10 +615,6 @@ intel_primary_plane_create(struct drm_i915_private 
*dev_priv, enum pipe pipe)
        int num_formats;
        int ret, zpos;
 
-       if (INTEL_GEN(dev_priv) >= 9)
-               return skl_universal_plane_create(dev_priv, pipe,
-                                                 PLANE_PRIMARY);
-
        plane = intel_plane_alloc();
        if (IS_ERR(plane))
                return plane;
@@ -869,7 +865,11 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, 
enum pipe pipe)
        crtc->pipe = pipe;
        crtc->num_scalers = RUNTIME_INFO(dev_priv)->num_scalers[pipe];
 
-       primary = intel_primary_plane_create(dev_priv, pipe);
+       if (INTEL_GEN(dev_priv) >= 9)
+               primary = skl_universal_plane_create(dev_priv, pipe,
+                                                    PLANE_PRIMARY);
+       else
+               primary = intel_primary_plane_create(dev_priv, pipe);
        if (IS_ERR(primary)) {
                ret = PTR_ERR(primary);
                goto fail;
@@ -879,7 +879,11 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, 
enum pipe pipe)
        for_each_sprite(dev_priv, pipe, sprite) {
                struct intel_plane *plane;
 
-               plane = intel_sprite_plane_create(dev_priv, pipe, sprite);
+               if (INTEL_GEN(dev_priv) >= 9)
+                       plane = skl_universal_plane_create(dev_priv, pipe,
+                                                          PLANE_SPRITE0 + 
sprite);
+               else
+                       plane = intel_sprite_plane_create(dev_priv, pipe, 
sprite);
                if (IS_ERR(plane)) {
                        ret = PTR_ERR(plane);
                        goto fail;
diff --git a/drivers/gpu/drm/i915/display/intel_gen9_plane.c 
b/drivers/gpu/drm/i915/display/intel_gen9_plane.c
new file mode 100644
index 000000000000..c76ff50d08c2
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/intel_gen9_plane.c
@@ -0,0 +1,1427 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_damage_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_plane_helper.h>
+
+#include "i915_drv.h"
+#include "intel_atomic_plane.h"
+#include "intel_display_types.h"
+#include "intel_pm.h"
+#include "intel_psr.h"
+#include "intel_sprite.h"
+
+static const u32 skl_plane_formats[] = {
+       DRM_FORMAT_C8,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_XRGB2101010,
+       DRM_FORMAT_XBGR2101010,
+       DRM_FORMAT_XRGB16161616F,
+       DRM_FORMAT_XBGR16161616F,
+       DRM_FORMAT_YUYV,
+       DRM_FORMAT_YVYU,
+       DRM_FORMAT_UYVY,
+       DRM_FORMAT_VYUY,
+       DRM_FORMAT_XYUV8888,
+};
+
+static const u32 skl_planar_formats[] = {
+       DRM_FORMAT_C8,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_XRGB2101010,
+       DRM_FORMAT_XBGR2101010,
+       DRM_FORMAT_XRGB16161616F,
+       DRM_FORMAT_XBGR16161616F,
+       DRM_FORMAT_YUYV,
+       DRM_FORMAT_YVYU,
+       DRM_FORMAT_UYVY,
+       DRM_FORMAT_VYUY,
+       DRM_FORMAT_NV12,
+       DRM_FORMAT_XYUV8888,
+};
+
+static const u32 glk_planar_formats[] = {
+       DRM_FORMAT_C8,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_XRGB2101010,
+       DRM_FORMAT_XBGR2101010,
+       DRM_FORMAT_XRGB16161616F,
+       DRM_FORMAT_XBGR16161616F,
+       DRM_FORMAT_YUYV,
+       DRM_FORMAT_YVYU,
+       DRM_FORMAT_UYVY,
+       DRM_FORMAT_VYUY,
+       DRM_FORMAT_NV12,
+       DRM_FORMAT_XYUV8888,
+       DRM_FORMAT_P010,
+       DRM_FORMAT_P012,
+       DRM_FORMAT_P016,
+};
+
+static const u32 icl_sdr_y_plane_formats[] = {
+       DRM_FORMAT_C8,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_XRGB2101010,
+       DRM_FORMAT_XBGR2101010,
+       DRM_FORMAT_ARGB2101010,
+       DRM_FORMAT_ABGR2101010,
+       DRM_FORMAT_YUYV,
+       DRM_FORMAT_YVYU,
+       DRM_FORMAT_UYVY,
+       DRM_FORMAT_VYUY,
+       DRM_FORMAT_Y210,
+       DRM_FORMAT_Y212,
+       DRM_FORMAT_Y216,
+       DRM_FORMAT_XYUV8888,
+       DRM_FORMAT_XVYU2101010,
+       DRM_FORMAT_XVYU12_16161616,
+       DRM_FORMAT_XVYU16161616,
+};
+
+static const u32 icl_sdr_uv_plane_formats[] = {
+       DRM_FORMAT_C8,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_XRGB2101010,
+       DRM_FORMAT_XBGR2101010,
+       DRM_FORMAT_ARGB2101010,
+       DRM_FORMAT_ABGR2101010,
+       DRM_FORMAT_YUYV,
+       DRM_FORMAT_YVYU,
+       DRM_FORMAT_UYVY,
+       DRM_FORMAT_VYUY,
+       DRM_FORMAT_NV12,
+       DRM_FORMAT_P010,
+       DRM_FORMAT_P012,
+       DRM_FORMAT_P016,
+       DRM_FORMAT_Y210,
+       DRM_FORMAT_Y212,
+       DRM_FORMAT_Y216,
+       DRM_FORMAT_XYUV8888,
+       DRM_FORMAT_XVYU2101010,
+       DRM_FORMAT_XVYU12_16161616,
+       DRM_FORMAT_XVYU16161616,
+};
+
+static const u32 icl_hdr_plane_formats[] = {
+       DRM_FORMAT_C8,
+       DRM_FORMAT_RGB565,
+       DRM_FORMAT_XRGB8888,
+       DRM_FORMAT_XBGR8888,
+       DRM_FORMAT_ARGB8888,
+       DRM_FORMAT_ABGR8888,
+       DRM_FORMAT_XRGB2101010,
+       DRM_FORMAT_XBGR2101010,
+       DRM_FORMAT_ARGB2101010,
+       DRM_FORMAT_ABGR2101010,
+       DRM_FORMAT_XRGB16161616F,
+       DRM_FORMAT_XBGR16161616F,
+       DRM_FORMAT_ARGB16161616F,
+       DRM_FORMAT_ABGR16161616F,
+       DRM_FORMAT_YUYV,
+       DRM_FORMAT_YVYU,
+       DRM_FORMAT_UYVY,
+       DRM_FORMAT_VYUY,
+       DRM_FORMAT_NV12,
+       DRM_FORMAT_P010,
+       DRM_FORMAT_P012,
+       DRM_FORMAT_P016,
+       DRM_FORMAT_Y210,
+       DRM_FORMAT_Y212,
+       DRM_FORMAT_Y216,
+       DRM_FORMAT_XYUV8888,
+       DRM_FORMAT_XVYU2101010,
+       DRM_FORMAT_XVYU12_16161616,
+       DRM_FORMAT_XVYU16161616,
+};
+
+static const u64 skl_plane_format_modifiers_noccs[] = {
+       I915_FORMAT_MOD_Yf_TILED,
+       I915_FORMAT_MOD_Y_TILED,
+       I915_FORMAT_MOD_X_TILED,
+       DRM_FORMAT_MOD_LINEAR,
+       DRM_FORMAT_MOD_INVALID
+};
+
+static const u64 skl_plane_format_modifiers_ccs[] = {
+       I915_FORMAT_MOD_Yf_TILED_CCS,
+       I915_FORMAT_MOD_Y_TILED_CCS,
+       I915_FORMAT_MOD_Yf_TILED,
+       I915_FORMAT_MOD_Y_TILED,
+       I915_FORMAT_MOD_X_TILED,
+       DRM_FORMAT_MOD_LINEAR,
+       DRM_FORMAT_MOD_INVALID
+};
+
+static const u64 gen12_plane_format_modifiers_mc_ccs[] = {
+       I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
+       I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
+       I915_FORMAT_MOD_Y_TILED,
+       I915_FORMAT_MOD_X_TILED,
+       DRM_FORMAT_MOD_LINEAR,
+       DRM_FORMAT_MOD_INVALID
+};
+
+static const u64 gen12_plane_format_modifiers_rc_ccs[] = {
+       I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
+       I915_FORMAT_MOD_Y_TILED,
+       I915_FORMAT_MOD_X_TILED,
+       DRM_FORMAT_MOD_LINEAR,
+       DRM_FORMAT_MOD_INVALID
+};
+
+
+static u8 icl_nv12_y_plane_mask(struct drm_i915_private *i915)
+{
+       if (IS_ROCKETLAKE(i915))
+               return BIT(PLANE_SPRITE2) | BIT(PLANE_SPRITE3);
+       else
+               return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+}
+
+bool icl_is_nv12_y_plane(struct drm_i915_private *dev_priv,
+                        enum plane_id plane_id)
+{
+       return INTEL_GEN(dev_priv) >= 11 &&
+               icl_nv12_y_plane_mask(dev_priv) & BIT(plane_id);
+}
+
+bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id 
plane_id)
+{
+       return INTEL_GEN(dev_priv) >= 11 &&
+               icl_hdr_plane_mask() & BIT(plane_id);
+}
+
+static void
+skl_plane_ratio(const struct intel_crtc_state *crtc_state,
+               const struct intel_plane_state *plane_state,
+               unsigned int *num, unsigned int *den)
+{
+       struct drm_i915_private *dev_priv = 
to_i915(plane_state->uapi.plane->dev);
+       const struct drm_framebuffer *fb = plane_state->hw.fb;
+
+       if (fb->format->cpp[0] == 8) {
+               if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
+                       *num = 10;
+                       *den = 8;
+               } else {
+                       *num = 9;
+                       *den = 8;
+               }
+       } else {
+               *num = 1;
+               *den = 1;
+       }
+}
+
+static int skl_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
+                              const struct intel_plane_state *plane_state)
+{
+       struct drm_i915_private *dev_priv = 
to_i915(plane_state->uapi.plane->dev);
+       unsigned int num, den;
+       unsigned int pixel_rate = intel_plane_pixel_rate(crtc_state, 
plane_state);
+
+       skl_plane_ratio(crtc_state, plane_state, &num, &den);
+
+       /* two pixels per clock on glk+ */
+       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+               den *= 2;
+
+       return DIV_ROUND_UP(pixel_rate * num, den);
+}
+
+static int skl_plane_max_width(const struct drm_framebuffer *fb,
+                              int color_plane,
+                              unsigned int rotation)
+{
+       int cpp = fb->format->cpp[color_plane];
+
+       switch (fb->modifier) {
+       case DRM_FORMAT_MOD_LINEAR:
+       case I915_FORMAT_MOD_X_TILED:
+               /*
+                * Validated limit is 4k, but has 5k should
+                * work apart from the following features:
+                * - Ytile (already limited to 4k)
+                * - FP16 (already limited to 4k)
+                * - render compression (already limited to 4k)
+                * - KVMR sprite and cursor (don't care)
+                * - horizontal panning (TODO verify this)
+                * - pipe and plane scaling (TODO verify this)
+                */
+               if (cpp == 8)
+                       return 4096;
+               else
+                       return 5120;
+       case I915_FORMAT_MOD_Y_TILED_CCS:
+       case I915_FORMAT_MOD_Yf_TILED_CCS:
+       case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
+               /* FIXME AUX plane? */
+       case I915_FORMAT_MOD_Y_TILED:
+       case I915_FORMAT_MOD_Yf_TILED:
+               if (cpp == 8)
+                       return 2048;
+               else
+                       return 4096;
+       default:
+               MISSING_CASE(fb->modifier);
+               return 2048;
+       }
+}
+
+static int glk_plane_max_width(const struct drm_framebuffer *fb,
+                              int color_plane,
+                              unsigned int rotation)
+{
+       int cpp = fb->format->cpp[color_plane];
+
+       switch (fb->modifier) {
+       case DRM_FORMAT_MOD_LINEAR:
+       case I915_FORMAT_MOD_X_TILED:
+               if (cpp == 8)
+                       return 4096;
+               else
+                       return 5120;
+       case I915_FORMAT_MOD_Y_TILED_CCS:
+       case I915_FORMAT_MOD_Yf_TILED_CCS:
+               /* FIXME AUX plane? */
+       case I915_FORMAT_MOD_Y_TILED:
+       case I915_FORMAT_MOD_Yf_TILED:
+               if (cpp == 8)
+                       return 2048;
+               else
+                       return 5120;
+       default:
+               MISSING_CASE(fb->modifier);
+               return 2048;
+       }
+}
+
+static int icl_plane_min_width(const struct drm_framebuffer *fb,
+                              int color_plane,
+                              unsigned int rotation)
+{
+       /* Wa_14011264657, Wa_14011050563: gen11+ */
+       switch (fb->format->format) {
+       case DRM_FORMAT_C8:
+               return 18;
+       case DRM_FORMAT_RGB565:
+               return 10;
+       case DRM_FORMAT_XRGB8888:
+       case DRM_FORMAT_XBGR8888:
+       case DRM_FORMAT_ARGB8888:
+       case DRM_FORMAT_ABGR8888:
+       case DRM_FORMAT_XRGB2101010:
+       case DRM_FORMAT_XBGR2101010:
+       case DRM_FORMAT_ARGB2101010:
+       case DRM_FORMAT_ABGR2101010:
+       case DRM_FORMAT_XVYU2101010:
+       case DRM_FORMAT_Y212:
+       case DRM_FORMAT_Y216:
+               return 6;
+       case DRM_FORMAT_NV12:
+               return 20;
+       case DRM_FORMAT_P010:
+       case DRM_FORMAT_P012:
+       case DRM_FORMAT_P016:
+               return 12;
+       case DRM_FORMAT_XRGB16161616F:
+       case DRM_FORMAT_XBGR16161616F:
+       case DRM_FORMAT_ARGB16161616F:
+       case DRM_FORMAT_ABGR16161616F:
+       case DRM_FORMAT_XVYU12_16161616:
+       case DRM_FORMAT_XVYU16161616:
+               return 4;
+       default:
+               return 1;
+       }
+}
+
+static int icl_plane_max_width(const struct drm_framebuffer *fb,
+                              int color_plane,
+                              unsigned int rotation)
+{
+       return 5120;
+}
+
+static int skl_plane_max_height(const struct drm_framebuffer *fb,
+                               int color_plane,
+                               unsigned int rotation)
+{
+       return 4096;
+}
+
+static int icl_plane_max_height(const struct drm_framebuffer *fb,
+                               int color_plane,
+                               unsigned int rotation)
+{
+       return 4320;
+}
+
+static unsigned int
+skl_plane_max_stride(struct intel_plane *plane,
+                    u32 pixel_format, u64 modifier,
+                    unsigned int rotation)
+{
+       const struct drm_format_info *info = drm_format_info(pixel_format);
+       int cpp = info->cpp[0];
+
+       /*
+        * "The stride in bytes must not exceed the
+        * of the size of 8K pixels and 32K bytes."
+        */
+       if (drm_rotation_90_or_270(rotation))
+               return min(8192, 32768 / cpp);
+       else
+               return min(8192 * cpp, 32768);
+}
+
+static void
+skl_program_scaler(struct intel_plane *plane,
+                  const struct intel_crtc_state *crtc_state,
+                  const struct intel_plane_state *plane_state)
+{
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       const struct drm_framebuffer *fb = plane_state->hw.fb;
+       enum pipe pipe = plane->pipe;
+       int scaler_id = plane_state->scaler_id;
+       const struct intel_scaler *scaler =
+               &crtc_state->scaler_state.scalers[scaler_id];
+       int crtc_x = plane_state->uapi.dst.x1;
+       int crtc_y = plane_state->uapi.dst.y1;
+       u32 crtc_w = drm_rect_width(&plane_state->uapi.dst);
+       u32 crtc_h = drm_rect_height(&plane_state->uapi.dst);
+       u16 y_hphase, uv_rgb_hphase;
+       u16 y_vphase, uv_rgb_vphase;
+       int hscale, vscale;
+       u32 ps_ctrl;
+
+       hscale = drm_rect_calc_hscale(&plane_state->uapi.src,
+                                     &plane_state->uapi.dst,
+                                     0, INT_MAX);
+       vscale = drm_rect_calc_vscale(&plane_state->uapi.src,
+                                     &plane_state->uapi.dst,
+                                     0, INT_MAX);
+
+       /* TODO: handle sub-pixel coordinates */
+       if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier) &&
+           !icl_is_hdr_plane(dev_priv, plane->id)) {
+               y_hphase = skl_scaler_calc_phase(1, hscale, false);
+               y_vphase = skl_scaler_calc_phase(1, vscale, false);
+
+               /* MPEG2 chroma siting convention */
+               uv_rgb_hphase = skl_scaler_calc_phase(2, hscale, true);
+               uv_rgb_vphase = skl_scaler_calc_phase(2, vscale, false);
+       } else {
+               /* not used */
+               y_hphase = 0;
+               y_vphase = 0;
+
+               uv_rgb_hphase = skl_scaler_calc_phase(1, hscale, false);
+               uv_rgb_vphase = skl_scaler_calc_phase(1, vscale, false);
+       }
+
+       ps_ctrl = skl_scaler_get_filter_select(plane_state->hw.scaling_filter, 
0);
+       ps_ctrl |= PS_SCALER_EN | PS_PLANE_SEL(plane->id) | scaler->mode;
+
+       skl_scaler_setup_filter(dev_priv, pipe, scaler_id, 0,
+                               plane_state->hw.scaling_filter);
+
+       intel_de_write_fw(dev_priv, SKL_PS_CTRL(pipe, scaler_id), ps_ctrl);
+       intel_de_write_fw(dev_priv, SKL_PS_VPHASE(pipe, scaler_id),
+                         PS_Y_PHASE(y_vphase) | 
PS_UV_RGB_PHASE(uv_rgb_vphase));
+       intel_de_write_fw(dev_priv, SKL_PS_HPHASE(pipe, scaler_id),
+                         PS_Y_PHASE(y_hphase) | 
PS_UV_RGB_PHASE(uv_rgb_hphase));
+       intel_de_write_fw(dev_priv, SKL_PS_WIN_POS(pipe, scaler_id),
+                         (crtc_x << 16) | crtc_y);
+       intel_de_write_fw(dev_priv, SKL_PS_WIN_SZ(pipe, scaler_id),
+                         (crtc_w << 16) | crtc_h);
+}
+
+/* Preoffset values for YUV to RGB Conversion */
+#define PREOFF_YUV_TO_RGB_HI           0x1800
+#define PREOFF_YUV_TO_RGB_ME           0x1F00
+#define PREOFF_YUV_TO_RGB_LO           0x1800
+
+#define  ROFF(x)          (((x) & 0xffff) << 16)
+#define  GOFF(x)          (((x) & 0xffff) << 0)
+#define  BOFF(x)          (((x) & 0xffff) << 16)
+
+static void
+icl_program_input_csc(struct intel_plane *plane,
+                     const struct intel_crtc_state *crtc_state,
+                     const struct intel_plane_state *plane_state)
+{
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       enum pipe pipe = plane->pipe;
+       enum plane_id plane_id = plane->id;
+
+       static const u16 input_csc_matrix[][9] = {
+               /*
+                * BT.601 full range YCbCr -> full range RGB
+                * The matrix required is :
+                * [1.000, 0.000, 1.371,
+                *  1.000, -0.336, -0.698,
+                *  1.000, 1.732, 0.0000]
+                */
+               [DRM_COLOR_YCBCR_BT601] = {
+                       0x7AF8, 0x7800, 0x0,
+                       0x8B28, 0x7800, 0x9AC0,
+                       0x0, 0x7800, 0x7DD8,
+               },
+               /*
+                * BT.709 full range YCbCr -> full range RGB
+                * The matrix required is :
+                * [1.000, 0.000, 1.574,
+                *  1.000, -0.187, -0.468,
+                *  1.000, 1.855, 0.0000]
+                */
+               [DRM_COLOR_YCBCR_BT709] = {
+                       0x7C98, 0x7800, 0x0,
+                       0x9EF8, 0x7800, 0xAC00,
+                       0x0, 0x7800,  0x7ED8,
+               },
+               /*
+                * BT.2020 full range YCbCr -> full range RGB
+                * The matrix required is :
+                * [1.000, 0.000, 1.474,
+                *  1.000, -0.1645, -0.5713,
+                *  1.000, 1.8814, 0.0000]
+                */
+               [DRM_COLOR_YCBCR_BT2020] = {
+                       0x7BC8, 0x7800, 0x0,
+                       0x8928, 0x7800, 0xAA88,
+                       0x0, 0x7800, 0x7F10,
+               },
+       };
+
+       /* Matrix for Limited Range to Full Range Conversion */
+       static const u16 input_csc_matrix_lr[][9] = {
+               /*
+                * BT.601 Limted range YCbCr -> full range RGB
+                * The matrix required is :
+                * [1.164384, 0.000, 1.596027,
+                *  1.164384, -0.39175, -0.812813,
+                *  1.164384, 2.017232, 0.0000]
+                */
+               [DRM_COLOR_YCBCR_BT601] = {
+                       0x7CC8, 0x7950, 0x0,
+                       0x8D00, 0x7950, 0x9C88,
+                       0x0, 0x7950, 0x6810,
+               },
+               /*
+                * BT.709 Limited range YCbCr -> full range RGB
+                * The matrix required is :
+                * [1.164384, 0.000, 1.792741,
+                *  1.164384, -0.213249, -0.532909,
+                *  1.164384, 2.112402, 0.0000]
+                */
+               [DRM_COLOR_YCBCR_BT709] = {
+                       0x7E58, 0x7950, 0x0,
+                       0x8888, 0x7950, 0xADA8,
+                       0x0, 0x7950,  0x6870,
+               },
+               /*
+                * BT.2020 Limited range YCbCr -> full range RGB
+                * The matrix required is :
+                * [1.164, 0.000, 1.678,
+                *  1.164, -0.1873, -0.6504,
+                *  1.164, 2.1417, 0.0000]
+                */
+               [DRM_COLOR_YCBCR_BT2020] = {
+                       0x7D70, 0x7950, 0x0,
+                       0x8A68, 0x7950, 0xAC00,
+                       0x0, 0x7950, 0x6890,
+               },
+       };
+       const u16 *csc;
+
+       if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
+               csc = input_csc_matrix[plane_state->hw.color_encoding];
+       else
+               csc = input_csc_matrix_lr[plane_state->hw.color_encoding];
+
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 0),
+                         ROFF(csc[0]) | GOFF(csc[1]));
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 1),
+                         BOFF(csc[2]));
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 2),
+                         ROFF(csc[3]) | GOFF(csc[4]));
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 3),
+                         BOFF(csc[5]));
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 4),
+                         ROFF(csc[6]) | GOFF(csc[7]));
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 5),
+                         BOFF(csc[8]));
+
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 0),
+                         PREOFF_YUV_TO_RGB_HI);
+       if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
+               intel_de_write_fw(dev_priv,
+                                 PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 1),
+                                 0);
+       else
+               intel_de_write_fw(dev_priv,
+                                 PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 1),
+                                 PREOFF_YUV_TO_RGB_ME);
+       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 2),
+                         PREOFF_YUV_TO_RGB_LO);
+       intel_de_write_fw(dev_priv,
+                         PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 0), 0x0);
+       intel_de_write_fw(dev_priv,
+                         PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 1), 0x0);
+       intel_de_write_fw(dev_priv,
+                         PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0);
+}
+
+static void
+skl_plane_async_flip(struct intel_plane *plane,
+                    const struct intel_crtc_state *crtc_state,
+                    const struct intel_plane_state *plane_state)
+{
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       unsigned long irqflags;
+       enum plane_id plane_id = plane->id;
+       enum pipe pipe = plane->pipe;
+       u32 surf_addr = plane_state->color_plane[0].offset;
+       u32 plane_ctl = plane_state->ctl;
+
+       plane_ctl |= skl_plane_ctl_crtc(crtc_state);
+
+       spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
+
+       intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
+       intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id),
+                         intel_plane_ggtt_offset(plane_state) + surf_addr);
+
+       spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
+}
+
+static void
+skl_program_plane(struct intel_plane *plane,
+                 const struct intel_crtc_state *crtc_state,
+                 const struct intel_plane_state *plane_state,
+                 int color_plane)
+{
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       enum plane_id plane_id = plane->id;
+       enum pipe pipe = plane->pipe;
+       const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
+       u32 surf_addr = plane_state->color_plane[color_plane].offset;
+       u32 stride = skl_plane_stride(plane_state, color_plane);
+       const struct drm_framebuffer *fb = plane_state->hw.fb;
+       int aux_plane = intel_main_to_aux_plane(fb, color_plane);
+       int crtc_x = plane_state->uapi.dst.x1;
+       int crtc_y = plane_state->uapi.dst.y1;
+       u32 x = plane_state->color_plane[color_plane].x;
+       u32 y = plane_state->color_plane[color_plane].y;
+       u32 src_w = drm_rect_width(&plane_state->uapi.src) >> 16;
+       u32 src_h = drm_rect_height(&plane_state->uapi.src) >> 16;
+       u8 alpha = plane_state->hw.alpha >> 8;
+       u32 plane_color_ctl = 0, aux_dist = 0;
+       unsigned long irqflags;
+       u32 keymsk, keymax;
+       u32 plane_ctl = plane_state->ctl;
+
+       plane_ctl |= skl_plane_ctl_crtc(crtc_state);
+
+       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+               plane_color_ctl = plane_state->color_ctl |
+                       glk_plane_color_ctl_crtc(crtc_state);
+
+       /* Sizes are 0 based */
+       src_w--;
+       src_h--;
+
+       keymax = (key->max_value & 0xffffff) | PLANE_KEYMAX_ALPHA(alpha);
+
+       keymsk = key->channel_mask & 0x7ffffff;
+       if (alpha < 0xff)
+               keymsk |= PLANE_KEYMSK_ALPHA_ENABLE;
+
+       /* The scaler will handle the output position */
+       if (plane_state->scaler_id >= 0) {
+               crtc_x = 0;
+               crtc_y = 0;
+       }
+
+       if (aux_plane) {
+               aux_dist = plane_state->color_plane[aux_plane].offset - 
surf_addr;
+
+               if (INTEL_GEN(dev_priv) < 12)
+                       aux_dist |= skl_plane_stride(plane_state, aux_plane);
+       }
+
+       spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
+
+       intel_de_write_fw(dev_priv, PLANE_STRIDE(pipe, plane_id), stride);
+       intel_de_write_fw(dev_priv, PLANE_POS(pipe, plane_id),
+                         (crtc_y << 16) | crtc_x);
+       intel_de_write_fw(dev_priv, PLANE_SIZE(pipe, plane_id),
+                         (src_h << 16) | src_w);
+
+       intel_de_write_fw(dev_priv, PLANE_AUX_DIST(pipe, plane_id), aux_dist);
+
+       if (icl_is_hdr_plane(dev_priv, plane_id))
+               intel_de_write_fw(dev_priv, PLANE_CUS_CTL(pipe, plane_id),
+                                 plane_state->cus_ctl);
+
+       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+               intel_de_write_fw(dev_priv, PLANE_COLOR_CTL(pipe, plane_id),
+                                 plane_color_ctl);
+
+       if (fb->format->is_yuv && icl_is_hdr_plane(dev_priv, plane_id))
+               icl_program_input_csc(plane, crtc_state, plane_state);
+
+       skl_write_plane_wm(plane, crtc_state);
+
+       intel_de_write_fw(dev_priv, PLANE_KEYVAL(pipe, plane_id),
+                         key->min_value);
+       intel_de_write_fw(dev_priv, PLANE_KEYMSK(pipe, plane_id), keymsk);
+       intel_de_write_fw(dev_priv, PLANE_KEYMAX(pipe, plane_id), keymax);
+
+       intel_de_write_fw(dev_priv, PLANE_OFFSET(pipe, plane_id),
+                         (y << 16) | x);
+
+       if (INTEL_GEN(dev_priv) < 11)
+               intel_de_write_fw(dev_priv, PLANE_AUX_OFFSET(pipe, plane_id),
+                                 (plane_state->color_plane[1].y << 16) | 
plane_state->color_plane[1].x);
+
+       if (!drm_atomic_crtc_needs_modeset(&crtc_state->uapi))
+               intel_psr2_program_plane_sel_fetch(plane, crtc_state, 
plane_state, color_plane);
+
+       /*
+        * The control register self-arms if the plane was previously
+        * disabled. Try to make the plane enable atomic by writing
+        * the control register just before the surface register.
+        */
+       intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
+       intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id),
+                         intel_plane_ggtt_offset(plane_state) + surf_addr);
+
+       if (plane_state->scaler_id >= 0)
+               skl_program_scaler(plane, crtc_state, plane_state);
+
+       spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
+}
+
+static void
+skl_update_plane(struct intel_plane *plane,
+                const struct intel_crtc_state *crtc_state,
+                const struct intel_plane_state *plane_state)
+{
+       int color_plane = 0;
+
+       if (plane_state->planar_linked_plane && !plane_state->planar_slave)
+               /* Program the UV plane on planar master */
+               color_plane = 1;
+
+       skl_program_plane(plane, crtc_state, plane_state, color_plane);
+}
+static void
+skl_disable_plane(struct intel_plane *plane,
+                 const struct intel_crtc_state *crtc_state)
+{
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       enum plane_id plane_id = plane->id;
+       enum pipe pipe = plane->pipe;
+       unsigned long irqflags;
+
+       spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
+
+       if (icl_is_hdr_plane(dev_priv, plane_id))
+               intel_de_write_fw(dev_priv, PLANE_CUS_CTL(pipe, plane_id), 0);
+
+       skl_write_plane_wm(plane, crtc_state);
+
+       intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), 0);
+       intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), 0);
+
+       spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
+}
+
+static bool
+skl_plane_get_hw_state(struct intel_plane *plane,
+                      enum pipe *pipe)
+{
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       enum intel_display_power_domain power_domain;
+       enum plane_id plane_id = plane->id;
+       intel_wakeref_t wakeref;
+       bool ret;
+
+       power_domain = POWER_DOMAIN_PIPE(plane->pipe);
+       wakeref = intel_display_power_get_if_enabled(dev_priv, power_domain);
+       if (!wakeref)
+               return false;
+
+       ret = intel_de_read(dev_priv, PLANE_CTL(plane->pipe, plane_id)) & 
PLANE_CTL_ENABLE;
+
+       *pipe = plane->pipe;
+
+       intel_display_power_put(dev_priv, power_domain, wakeref);
+
+       return ret;
+}
+
+static bool intel_format_is_p01x(u32 format)
+{
+       switch (format) {
+       case DRM_FORMAT_P010:
+       case DRM_FORMAT_P012:
+       case DRM_FORMAT_P016:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
+                             const struct intel_plane_state *plane_state)
+{
+       struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       const struct drm_framebuffer *fb = plane_state->hw.fb;
+       unsigned int rotation = plane_state->hw.rotation;
+       struct drm_format_name_buf format_name;
+
+       if (!fb)
+               return 0;
+
+       if (rotation & ~(DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180) &&
+           is_ccs_modifier(fb->modifier)) {
+               drm_dbg_kms(&dev_priv->drm,
+                           "RC support only with 0/180 degree rotation (%x)\n",
+                           rotation);
+               return -EINVAL;
+       }
+
+       if (rotation & DRM_MODE_REFLECT_X &&
+           fb->modifier == DRM_FORMAT_MOD_LINEAR) {
+               drm_dbg_kms(&dev_priv->drm,
+                           "horizontal flip is not supported with linear 
surface formats\n");
+               return -EINVAL;
+       }
+
+       if (drm_rotation_90_or_270(rotation)) {
+               if (fb->modifier != I915_FORMAT_MOD_Y_TILED &&
+                   fb->modifier != I915_FORMAT_MOD_Yf_TILED) {
+                       drm_dbg_kms(&dev_priv->drm,
+                                   "Y/Yf tiling required for 90/270!\n");
+                       return -EINVAL;
+               }
+
+               /*
+                * 90/270 is not allowed with RGB64 16:16:16:16 and
+                * Indexed 8-bit. RGB 16-bit 5:6:5 is allowed gen11 onwards.
+                */
+               switch (fb->format->format) {
+               case DRM_FORMAT_RGB565:
+                       if (INTEL_GEN(dev_priv) >= 11)
+                               break;
+                       fallthrough;
+               case DRM_FORMAT_C8:
+               case DRM_FORMAT_XRGB16161616F:
+               case DRM_FORMAT_XBGR16161616F:
+               case DRM_FORMAT_ARGB16161616F:
+               case DRM_FORMAT_ABGR16161616F:
+               case DRM_FORMAT_Y210:
+               case DRM_FORMAT_Y212:
+               case DRM_FORMAT_Y216:
+               case DRM_FORMAT_XVYU12_16161616:
+               case DRM_FORMAT_XVYU16161616:
+                       drm_dbg_kms(&dev_priv->drm,
+                                   "Unsupported pixel format %s for 90/270!\n",
+                                   drm_get_format_name(fb->format->format,
+                                                       &format_name));
+                       return -EINVAL;
+               default:
+                       break;
+               }
+       }
+
+       /* Y-tiling is not supported in IF-ID Interlace mode */
+       if (crtc_state->hw.enable &&
+           crtc_state->hw.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE &&
+           (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
+            fb->modifier == I915_FORMAT_MOD_Yf_TILED ||
+            fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+            fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
+            fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+            fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS)) {
+               drm_dbg_kms(&dev_priv->drm,
+                           "Y/Yf tiling not supported in IF-ID mode\n");
+               return -EINVAL;
+       }
+
+       /* Wa_1606054188:tgl */
+       if (IS_TIGERLAKE(dev_priv) &&
+           plane_state->ckey.flags & I915_SET_COLORKEY_SOURCE &&
+           intel_format_is_p01x(fb->format->format)) {
+               drm_dbg_kms(&dev_priv->drm,
+                           "Source color keying not supported with P01x 
formats\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int skl_plane_check_dst_coordinates(const struct intel_crtc_state 
*crtc_state,
+                                          const struct intel_plane_state 
*plane_state)
+{
+       struct drm_i915_private *dev_priv =
+               to_i915(plane_state->uapi.plane->dev);
+       int crtc_x = plane_state->uapi.dst.x1;
+       int crtc_w = drm_rect_width(&plane_state->uapi.dst);
+       int pipe_src_w = crtc_state->pipe_src_w;
+
+       /*
+        * Display WA #1175: cnl,glk
+        * Planes other than the cursor may cause FIFO underflow and display
+        * corruption if starting less than 4 pixels from the right edge of
+        * the screen.
+        * Besides the above WA fix the similar problem, where planes other
+        * than the cursor ending less than 4 pixels from the left edge of the
+        * screen may cause FIFO underflow and display corruption.
+        */
+       if ((IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) &&
+           (crtc_x + crtc_w < 4 || crtc_x > pipe_src_w - 4)) {
+               drm_dbg_kms(&dev_priv->drm,
+                           "requested plane X %s position %d invalid (valid 
range %d-%d)\n",
+                           crtc_x + crtc_w < 4 ? "end" : "start",
+                           crtc_x + crtc_w < 4 ? crtc_x + crtc_w : crtc_x,
+                           4, pipe_src_w - 4);
+               return -ERANGE;
+       }
+
+       return 0;
+}
+
+static int skl_plane_check_nv12_rotation(const struct intel_plane_state 
*plane_state)
+{
+       const struct drm_framebuffer *fb = plane_state->hw.fb;
+       unsigned int rotation = plane_state->hw.rotation;
+       int src_w = drm_rect_width(&plane_state->uapi.src) >> 16;
+
+       /* Display WA #1106 */
+       if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier) &&
+           src_w & 3 &&
+           (rotation == DRM_MODE_ROTATE_270 ||
+            rotation == (DRM_MODE_REFLECT_X | DRM_MODE_ROTATE_90))) {
+               DRM_DEBUG_KMS("src width must be multiple of 4 for rotated 
planar YUV\n");
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int skl_plane_max_scale(struct drm_i915_private *dev_priv,
+                              const struct drm_framebuffer *fb)
+{
+       /*
+        * We don't yet know the final source width nor
+        * whether we can use the HQ scaler mode. Assume
+        * the best case.
+        * FIXME need to properly check this later.
+        */
+       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) ||
+           !intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
+               return 0x30000 - 1;
+       else
+               return 0x20000 - 1;
+}
+
+static bool intel_fb_scalable(const struct drm_framebuffer *fb)
+{
+       if (!fb)
+               return false;
+
+       switch (fb->format->format) {
+       case DRM_FORMAT_C8:
+               return false;
+       case DRM_FORMAT_XRGB16161616F:
+       case DRM_FORMAT_ARGB16161616F:
+       case DRM_FORMAT_XBGR16161616F:
+       case DRM_FORMAT_ABGR16161616F:
+               return INTEL_GEN(to_i915(fb->dev)) >= 11;
+       default:
+               return true;
+       }
+}
+
+static int skl_plane_check(struct intel_crtc_state *crtc_state,
+                          struct intel_plane_state *plane_state)
+{
+       struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
+       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+       const struct drm_framebuffer *fb = plane_state->hw.fb;
+       int min_scale = DRM_PLANE_HELPER_NO_SCALING;
+       int max_scale = DRM_PLANE_HELPER_NO_SCALING;
+       int ret;
+
+       ret = skl_plane_check_fb(crtc_state, plane_state);
+       if (ret)
+               return ret;
+
+       /* use scaler when colorkey is not required */
+       if (!plane_state->ckey.flags && intel_fb_scalable(fb)) {
+               min_scale = 1;
+               max_scale = skl_plane_max_scale(dev_priv, fb);
+       }
+
+       ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
+                                               min_scale, max_scale, true);
+       if (ret)
+               return ret;
+
+       ret = skl_check_plane_surface(plane_state);
+       if (ret)
+               return ret;
+
+       if (!plane_state->uapi.visible)
+               return 0;
+
+       ret = skl_plane_check_dst_coordinates(crtc_state, plane_state);
+       if (ret)
+               return ret;
+
+       ret = intel_plane_check_src_coordinates(plane_state);
+       if (ret)
+               return ret;
+
+       ret = skl_plane_check_nv12_rotation(plane_state);
+       if (ret)
+               return ret;
+
+       /* HW only has 8 bits pixel precision, disable plane if invisible */
+       if (!(plane_state->hw.alpha >> 8))
+               plane_state->uapi.visible = false;
+
+       plane_state->ctl = skl_plane_ctl(crtc_state, plane_state);
+
+       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+               plane_state->color_ctl = glk_plane_color_ctl(crtc_state,
+                                                            plane_state);
+
+       if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier) &&
+           icl_is_hdr_plane(dev_priv, plane->id))
+               /* Enable and use MPEG-2 chroma siting */
+               plane_state->cus_ctl = PLANE_CUS_ENABLE |
+                       PLANE_CUS_HPHASE_0 |
+                       PLANE_CUS_VPHASE_SIGN_NEGATIVE | PLANE_CUS_VPHASE_0_25;
+       else
+               plane_state->cus_ctl = 0;
+
+       return 0;
+}
+
+static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,
+                             enum pipe pipe, enum plane_id plane_id)
+{
+       if (!HAS_FBC(dev_priv))
+               return false;
+
+       return pipe == PIPE_A && plane_id == PLANE_PRIMARY;
+}
+
+static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
+                                enum pipe pipe, enum plane_id plane_id)
+{
+       /* Display WA #0870: skl, bxt */
+       if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
+               return false;
+
+       if (IS_GEN(dev_priv, 9) && !IS_GEMINILAKE(dev_priv) && pipe == PIPE_C)
+               return false;
+
+       if (plane_id != PLANE_PRIMARY && plane_id != PLANE_SPRITE0)
+               return false;
+
+       return true;
+}
+
+static const u32 *skl_get_plane_formats(struct drm_i915_private *dev_priv,
+                                       enum pipe pipe, enum plane_id plane_id,
+                                       int *num_formats)
+{
+       if (skl_plane_has_planar(dev_priv, pipe, plane_id)) {
+               *num_formats = ARRAY_SIZE(skl_planar_formats);
+               return skl_planar_formats;
+       } else {
+               *num_formats = ARRAY_SIZE(skl_plane_formats);
+               return skl_plane_formats;
+       }
+}
+
+static const u32 *glk_get_plane_formats(struct drm_i915_private *dev_priv,
+                                       enum pipe pipe, enum plane_id plane_id,
+                                       int *num_formats)
+{
+       if (skl_plane_has_planar(dev_priv, pipe, plane_id)) {
+               *num_formats = ARRAY_SIZE(glk_planar_formats);
+               return glk_planar_formats;
+       } else {
+               *num_formats = ARRAY_SIZE(skl_plane_formats);
+               return skl_plane_formats;
+       }
+}
+
+static const u32 *icl_get_plane_formats(struct drm_i915_private *dev_priv,
+                                       enum pipe pipe, enum plane_id plane_id,
+                                       int *num_formats)
+{
+       if (icl_is_hdr_plane(dev_priv, plane_id)) {
+               *num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
+               return icl_hdr_plane_formats;
+       } else if (icl_is_nv12_y_plane(dev_priv, plane_id)) {
+               *num_formats = ARRAY_SIZE(icl_sdr_y_plane_formats);
+               return icl_sdr_y_plane_formats;
+       } else {
+               *num_formats = ARRAY_SIZE(icl_sdr_uv_plane_formats);
+               return icl_sdr_uv_plane_formats;
+       }
+}
+
+static bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
+                             enum pipe pipe, enum plane_id plane_id)
+{
+       if (plane_id == PLANE_CURSOR)
+               return false;
+
+       if (INTEL_GEN(dev_priv) >= 10)
+               return true;
+
+       if (IS_GEMINILAKE(dev_priv))
+               return pipe != PIPE_C;
+
+       return pipe != PIPE_C &&
+               (plane_id == PLANE_PRIMARY ||
+                plane_id == PLANE_SPRITE0);
+}
+
+static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
+                                          u32 format, u64 modifier)
+{
+       struct intel_plane *plane = to_intel_plane(_plane);
+
+       switch (modifier) {
+       case DRM_FORMAT_MOD_LINEAR:
+       case I915_FORMAT_MOD_X_TILED:
+       case I915_FORMAT_MOD_Y_TILED:
+       case I915_FORMAT_MOD_Yf_TILED:
+               break;
+       case I915_FORMAT_MOD_Y_TILED_CCS:
+       case I915_FORMAT_MOD_Yf_TILED_CCS:
+               if (!plane->has_ccs)
+                       return false;
+               break;
+       default:
+               return false;
+       }
+
+       switch (format) {
+       case DRM_FORMAT_XRGB8888:
+       case DRM_FORMAT_XBGR8888:
+       case DRM_FORMAT_ARGB8888:
+       case DRM_FORMAT_ABGR8888:
+               if (is_ccs_modifier(modifier))
+                       return true;
+               fallthrough;
+       case DRM_FORMAT_RGB565:
+       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_XVYU2101010:
+               if (modifier == I915_FORMAT_MOD_Yf_TILED)
+                       return true;
+               fallthrough;
+       case DRM_FORMAT_C8:
+       case DRM_FORMAT_XBGR16161616F:
+       case DRM_FORMAT_ABGR16161616F:
+       case DRM_FORMAT_XRGB16161616F:
+       case DRM_FORMAT_ARGB16161616F:
+       case DRM_FORMAT_Y210:
+       case DRM_FORMAT_Y212:
+       case DRM_FORMAT_Y216:
+       case DRM_FORMAT_XVYU12_16161616:
+       case DRM_FORMAT_XVYU16161616:
+               if (modifier == DRM_FORMAT_MOD_LINEAR ||
+                   modifier == I915_FORMAT_MOD_X_TILED ||
+                   modifier == I915_FORMAT_MOD_Y_TILED)
+                       return true;
+               fallthrough;
+       default:
+               return false;
+       }
+}
+
+static bool gen12_plane_supports_mc_ccs(struct drm_i915_private *dev_priv,
+                                       enum plane_id plane_id)
+{
+       /* Wa_14010477008:tgl[a0..c0],rkl[all],dg1[all] */
+       if (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv) ||
+           IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_C0))
+               return false;
+
+       return plane_id < PLANE_SPRITE4;
+}
+
+static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
+                                            u32 format, u64 modifier)
+{
+       struct drm_i915_private *dev_priv = to_i915(_plane->dev);
+       struct intel_plane *plane = to_intel_plane(_plane);
+
+       switch (modifier) {
+       case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
+               if (!gen12_plane_supports_mc_ccs(dev_priv, plane->id))
+                       return false;
+               fallthrough;
+       case DRM_FORMAT_MOD_LINEAR:
+       case I915_FORMAT_MOD_X_TILED:
+       case I915_FORMAT_MOD_Y_TILED:
+       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
+               break;
+       default:
+               return false;
+       }
+
+       switch (format) {
+       case DRM_FORMAT_XRGB8888:
+       case DRM_FORMAT_XBGR8888:
+       case DRM_FORMAT_ARGB8888:
+       case DRM_FORMAT_ABGR8888:
+               if (is_ccs_modifier(modifier))
+                       return true;
+               fallthrough;
+       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:
+               if (modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS)
+                       return true;
+               fallthrough;
+       case DRM_FORMAT_RGB565:
+       case DRM_FORMAT_XRGB2101010:
+       case DRM_FORMAT_XBGR2101010:
+       case DRM_FORMAT_ARGB2101010:
+       case DRM_FORMAT_ABGR2101010:
+       case DRM_FORMAT_XVYU2101010:
+       case DRM_FORMAT_C8:
+       case DRM_FORMAT_XBGR16161616F:
+       case DRM_FORMAT_ABGR16161616F:
+       case DRM_FORMAT_XRGB16161616F:
+       case DRM_FORMAT_ARGB16161616F:
+       case DRM_FORMAT_Y210:
+       case DRM_FORMAT_Y212:
+       case DRM_FORMAT_Y216:
+       case DRM_FORMAT_XVYU12_16161616:
+       case DRM_FORMAT_XVYU16161616:
+               if (modifier == DRM_FORMAT_MOD_LINEAR ||
+                   modifier == I915_FORMAT_MOD_X_TILED ||
+                   modifier == I915_FORMAT_MOD_Y_TILED)
+                       return true;
+               fallthrough;
+       default:
+               return false;
+       }
+}
+
+static const u64 *gen12_get_plane_modifiers(struct drm_i915_private *dev_priv,
+                                           enum plane_id plane_id)
+{
+       if (gen12_plane_supports_mc_ccs(dev_priv, plane_id))
+               return gen12_plane_format_modifiers_mc_ccs;
+       else
+               return gen12_plane_format_modifiers_rc_ccs;
+}
+
+static const struct drm_plane_funcs skl_plane_funcs = {
+       .update_plane = drm_atomic_helper_update_plane,
+       .disable_plane = drm_atomic_helper_disable_plane,
+       .destroy = intel_plane_destroy,
+       .atomic_duplicate_state = intel_plane_duplicate_state,
+       .atomic_destroy_state = intel_plane_destroy_state,
+       .format_mod_supported = skl_plane_format_mod_supported,
+};
+
+static const struct drm_plane_funcs gen12_plane_funcs = {
+       .update_plane = drm_atomic_helper_update_plane,
+       .disable_plane = drm_atomic_helper_disable_plane,
+       .destroy = intel_plane_destroy,
+       .atomic_duplicate_state = intel_plane_duplicate_state,
+       .atomic_destroy_state = intel_plane_destroy_state,
+       .format_mod_supported = gen12_plane_format_mod_supported,
+};
+
+struct intel_plane *
+skl_universal_plane_create(struct drm_i915_private *dev_priv,
+                          enum pipe pipe, enum plane_id plane_id)
+{
+       const struct drm_plane_funcs *plane_funcs;
+       struct intel_plane *plane;
+       enum drm_plane_type plane_type;
+       unsigned int supported_rotations;
+       unsigned int supported_csc;
+       const u64 *modifiers;
+       const u32 *formats;
+       int num_formats;
+       int ret;
+
+       plane = intel_plane_alloc();
+       if (IS_ERR(plane))
+               return plane;
+
+       plane->pipe = pipe;
+       plane->id = plane_id;
+       plane->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, plane_id);
+
+       plane->has_fbc = skl_plane_has_fbc(dev_priv, pipe, plane_id);
+       if (plane->has_fbc) {
+               struct intel_fbc *fbc = &dev_priv->fbc;
+
+               fbc->possible_framebuffer_bits |= plane->frontbuffer_bit;
+       }
+
+       if (INTEL_GEN(dev_priv) >= 11) {
+               plane->min_width = icl_plane_min_width;
+               plane->max_width = icl_plane_max_width;
+               plane->max_height = icl_plane_max_height;
+       } else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
+               plane->max_width = glk_plane_max_width;
+               plane->max_height = skl_plane_max_height;
+       } else {
+               plane->max_width = skl_plane_max_width;
+               plane->max_height = skl_plane_max_height;
+       }
+
+       plane->max_stride = skl_plane_max_stride;
+       plane->update_plane = skl_update_plane;
+       plane->disable_plane = skl_disable_plane;
+       plane->get_hw_state = skl_plane_get_hw_state;
+       plane->check_plane = skl_plane_check;
+       plane->min_cdclk = skl_plane_min_cdclk;
+       plane->async_flip = skl_plane_async_flip;
+
+       if (INTEL_GEN(dev_priv) >= 11)
+               formats = icl_get_plane_formats(dev_priv, pipe,
+                                               plane_id, &num_formats);
+       else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+               formats = glk_get_plane_formats(dev_priv, pipe,
+                                               plane_id, &num_formats);
+       else
+               formats = skl_get_plane_formats(dev_priv, pipe,
+                                               plane_id, &num_formats);
+
+       plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, plane_id);
+       if (INTEL_GEN(dev_priv) >= 12) {
+               modifiers = gen12_get_plane_modifiers(dev_priv, plane_id);
+               plane_funcs = &gen12_plane_funcs;
+       } else {
+               if (plane->has_ccs)
+                       modifiers = skl_plane_format_modifiers_ccs;
+               else
+                       modifiers = skl_plane_format_modifiers_noccs;
+               plane_funcs = &skl_plane_funcs;
+       }
+
+       if (plane_id == PLANE_PRIMARY)
+               plane_type = DRM_PLANE_TYPE_PRIMARY;
+       else
+               plane_type = DRM_PLANE_TYPE_OVERLAY;
+
+       ret = drm_universal_plane_init(&dev_priv->drm, &plane->base,
+                                      0, plane_funcs,
+                                      formats, num_formats, modifiers,
+                                      plane_type,
+                                      "plane %d%c", plane_id + 1,
+                                      pipe_name(pipe));
+       if (ret)
+               goto fail;
+
+       supported_rotations =
+               DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |
+               DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;
+
+       if (INTEL_GEN(dev_priv) >= 10)
+               supported_rotations |= DRM_MODE_REFLECT_X;
+ 
+       drm_plane_create_rotation_property(&plane->base,
+                                          DRM_MODE_ROTATE_0,
+                                          supported_rotations);
+
+       supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709);
+
+       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+               supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020);
+
+       drm_plane_create_color_properties(&plane->base,
+                                         supported_csc,
+                                         BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
+                                         BIT(DRM_COLOR_YCBCR_FULL_RANGE),
+                                         DRM_COLOR_YCBCR_BT709,
+                                         DRM_COLOR_YCBCR_LIMITED_RANGE);
+
+       drm_plane_create_alpha_property(&plane->base);
+       drm_plane_create_blend_mode_property(&plane->base,
+                                            BIT(DRM_MODE_BLEND_PIXEL_NONE) |
+                                            BIT(DRM_MODE_BLEND_PREMULTI) |
+                                            BIT(DRM_MODE_BLEND_COVERAGE));
+
+       drm_plane_create_zpos_immutable_property(&plane->base, plane_id);
+
+       if (INTEL_GEN(dev_priv) >= 12)
+               drm_plane_enable_fb_damage_clips(&plane->base);
+
+       if (INTEL_GEN(dev_priv) >= 10)
+               drm_plane_create_scaling_filter_property(&plane->base,
+                                               BIT(DRM_SCALING_FILTER_DEFAULT) 
|
+                                               
BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
+
+       drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
+
+       return plane;
+
+fail:
+       intel_plane_free(plane);
+
+       return ERR_PTR(ret);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c 
b/drivers/gpu/drm/i915/display/intel_sprite.c
index b7e208816074..ab2cd4825e2e 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -364,599 +364,6 @@ int intel_plane_check_src_coordinates(struct 
intel_plane_state *plane_state)
        return 0;
 }
 
-static u8 icl_nv12_y_plane_mask(struct drm_i915_private *i915)
-{
-       if (IS_ROCKETLAKE(i915))
-               return BIT(PLANE_SPRITE2) | BIT(PLANE_SPRITE3);
-       else
-               return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
-}
-
-bool icl_is_nv12_y_plane(struct drm_i915_private *dev_priv,
-                        enum plane_id plane_id)
-{
-       return INTEL_GEN(dev_priv) >= 11 &&
-               icl_nv12_y_plane_mask(dev_priv) & BIT(plane_id);
-}
-
-bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id 
plane_id)
-{
-       return INTEL_GEN(dev_priv) >= 11 &&
-               icl_hdr_plane_mask() & BIT(plane_id);
-}
-
-static void
-skl_plane_ratio(const struct intel_crtc_state *crtc_state,
-               const struct intel_plane_state *plane_state,
-               unsigned int *num, unsigned int *den)
-{
-       struct drm_i915_private *dev_priv = 
to_i915(plane_state->uapi.plane->dev);
-       const struct drm_framebuffer *fb = plane_state->hw.fb;
-
-       if (fb->format->cpp[0] == 8) {
-               if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
-                       *num = 10;
-                       *den = 8;
-               } else {
-                       *num = 9;
-                       *den = 8;
-               }
-       } else {
-               *num = 1;
-               *den = 1;
-       }
-}
-
-static int skl_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
-                              const struct intel_plane_state *plane_state)
-{
-       struct drm_i915_private *dev_priv = 
to_i915(plane_state->uapi.plane->dev);
-       unsigned int num, den;
-       unsigned int pixel_rate = intel_plane_pixel_rate(crtc_state, 
plane_state);
-
-       skl_plane_ratio(crtc_state, plane_state, &num, &den);
-
-       /* two pixels per clock on glk+ */
-       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
-               den *= 2;
-
-       return DIV_ROUND_UP(pixel_rate * num, den);
-}
-
-static int skl_plane_max_width(const struct drm_framebuffer *fb,
-                              int color_plane,
-                              unsigned int rotation)
-{
-       int cpp = fb->format->cpp[color_plane];
-
-       switch (fb->modifier) {
-       case DRM_FORMAT_MOD_LINEAR:
-       case I915_FORMAT_MOD_X_TILED:
-               /*
-                * Validated limit is 4k, but has 5k should
-                * work apart from the following features:
-                * - Ytile (already limited to 4k)
-                * - FP16 (already limited to 4k)
-                * - render compression (already limited to 4k)
-                * - KVMR sprite and cursor (don't care)
-                * - horizontal panning (TODO verify this)
-                * - pipe and plane scaling (TODO verify this)
-                */
-               if (cpp == 8)
-                       return 4096;
-               else
-                       return 5120;
-       case I915_FORMAT_MOD_Y_TILED_CCS:
-       case I915_FORMAT_MOD_Yf_TILED_CCS:
-       case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
-               /* FIXME AUX plane? */
-       case I915_FORMAT_MOD_Y_TILED:
-       case I915_FORMAT_MOD_Yf_TILED:
-               if (cpp == 8)
-                       return 2048;
-               else
-                       return 4096;
-       default:
-               MISSING_CASE(fb->modifier);
-               return 2048;
-       }
-}
-
-static int glk_plane_max_width(const struct drm_framebuffer *fb,
-                              int color_plane,
-                              unsigned int rotation)
-{
-       int cpp = fb->format->cpp[color_plane];
-
-       switch (fb->modifier) {
-       case DRM_FORMAT_MOD_LINEAR:
-       case I915_FORMAT_MOD_X_TILED:
-               if (cpp == 8)
-                       return 4096;
-               else
-                       return 5120;
-       case I915_FORMAT_MOD_Y_TILED_CCS:
-       case I915_FORMAT_MOD_Yf_TILED_CCS:
-               /* FIXME AUX plane? */
-       case I915_FORMAT_MOD_Y_TILED:
-       case I915_FORMAT_MOD_Yf_TILED:
-               if (cpp == 8)
-                       return 2048;
-               else
-                       return 5120;
-       default:
-               MISSING_CASE(fb->modifier);
-               return 2048;
-       }
-}
-
-static int icl_plane_min_width(const struct drm_framebuffer *fb,
-                              int color_plane,
-                              unsigned int rotation)
-{
-       /* Wa_14011264657, Wa_14011050563: gen11+ */
-       switch (fb->format->format) {
-       case DRM_FORMAT_C8:
-               return 18;
-       case DRM_FORMAT_RGB565:
-               return 10;
-       case DRM_FORMAT_XRGB8888:
-       case DRM_FORMAT_XBGR8888:
-       case DRM_FORMAT_ARGB8888:
-       case DRM_FORMAT_ABGR8888:
-       case DRM_FORMAT_XRGB2101010:
-       case DRM_FORMAT_XBGR2101010:
-       case DRM_FORMAT_ARGB2101010:
-       case DRM_FORMAT_ABGR2101010:
-       case DRM_FORMAT_XVYU2101010:
-       case DRM_FORMAT_Y212:
-       case DRM_FORMAT_Y216:
-               return 6;
-       case DRM_FORMAT_NV12:
-               return 20;
-       case DRM_FORMAT_P010:
-       case DRM_FORMAT_P012:
-       case DRM_FORMAT_P016:
-               return 12;
-       case DRM_FORMAT_XRGB16161616F:
-       case DRM_FORMAT_XBGR16161616F:
-       case DRM_FORMAT_ARGB16161616F:
-       case DRM_FORMAT_ABGR16161616F:
-       case DRM_FORMAT_XVYU12_16161616:
-       case DRM_FORMAT_XVYU16161616:
-               return 4;
-       default:
-               return 1;
-       }
-}
-
-static int icl_plane_max_width(const struct drm_framebuffer *fb,
-                              int color_plane,
-                              unsigned int rotation)
-{
-       return 5120;
-}
-
-static int skl_plane_max_height(const struct drm_framebuffer *fb,
-                               int color_plane,
-                               unsigned int rotation)
-{
-       return 4096;
-}
-
-static int icl_plane_max_height(const struct drm_framebuffer *fb,
-                               int color_plane,
-                               unsigned int rotation)
-{
-       return 4320;
-}
-
-static unsigned int
-skl_plane_max_stride(struct intel_plane *plane,
-                    u32 pixel_format, u64 modifier,
-                    unsigned int rotation)
-{
-       const struct drm_format_info *info = drm_format_info(pixel_format);
-       int cpp = info->cpp[0];
-
-       /*
-        * "The stride in bytes must not exceed the
-        * of the size of 8K pixels and 32K bytes."
-        */
-       if (drm_rotation_90_or_270(rotation))
-               return min(8192, 32768 / cpp);
-       else
-               return min(8192 * cpp, 32768);
-}
-
-static void
-skl_program_scaler(struct intel_plane *plane,
-                  const struct intel_crtc_state *crtc_state,
-                  const struct intel_plane_state *plane_state)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       const struct drm_framebuffer *fb = plane_state->hw.fb;
-       enum pipe pipe = plane->pipe;
-       int scaler_id = plane_state->scaler_id;
-       const struct intel_scaler *scaler =
-               &crtc_state->scaler_state.scalers[scaler_id];
-       int crtc_x = plane_state->uapi.dst.x1;
-       int crtc_y = plane_state->uapi.dst.y1;
-       u32 crtc_w = drm_rect_width(&plane_state->uapi.dst);
-       u32 crtc_h = drm_rect_height(&plane_state->uapi.dst);
-       u16 y_hphase, uv_rgb_hphase;
-       u16 y_vphase, uv_rgb_vphase;
-       int hscale, vscale;
-       u32 ps_ctrl;
-
-       hscale = drm_rect_calc_hscale(&plane_state->uapi.src,
-                                     &plane_state->uapi.dst,
-                                     0, INT_MAX);
-       vscale = drm_rect_calc_vscale(&plane_state->uapi.src,
-                                     &plane_state->uapi.dst,
-                                     0, INT_MAX);
-
-       /* TODO: handle sub-pixel coordinates */
-       if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier) &&
-           !icl_is_hdr_plane(dev_priv, plane->id)) {
-               y_hphase = skl_scaler_calc_phase(1, hscale, false);
-               y_vphase = skl_scaler_calc_phase(1, vscale, false);
-
-               /* MPEG2 chroma siting convention */
-               uv_rgb_hphase = skl_scaler_calc_phase(2, hscale, true);
-               uv_rgb_vphase = skl_scaler_calc_phase(2, vscale, false);
-       } else {
-               /* not used */
-               y_hphase = 0;
-               y_vphase = 0;
-
-               uv_rgb_hphase = skl_scaler_calc_phase(1, hscale, false);
-               uv_rgb_vphase = skl_scaler_calc_phase(1, vscale, false);
-       }
-
-       ps_ctrl = skl_scaler_get_filter_select(plane_state->hw.scaling_filter, 
0);
-       ps_ctrl |= PS_SCALER_EN | PS_PLANE_SEL(plane->id) | scaler->mode;
-
-       skl_scaler_setup_filter(dev_priv, pipe, scaler_id, 0,
-                               plane_state->hw.scaling_filter);
-
-       intel_de_write_fw(dev_priv, SKL_PS_CTRL(pipe, scaler_id), ps_ctrl);
-       intel_de_write_fw(dev_priv, SKL_PS_VPHASE(pipe, scaler_id),
-                         PS_Y_PHASE(y_vphase) | 
PS_UV_RGB_PHASE(uv_rgb_vphase));
-       intel_de_write_fw(dev_priv, SKL_PS_HPHASE(pipe, scaler_id),
-                         PS_Y_PHASE(y_hphase) | 
PS_UV_RGB_PHASE(uv_rgb_hphase));
-       intel_de_write_fw(dev_priv, SKL_PS_WIN_POS(pipe, scaler_id),
-                         (crtc_x << 16) | crtc_y);
-       intel_de_write_fw(dev_priv, SKL_PS_WIN_SZ(pipe, scaler_id),
-                         (crtc_w << 16) | crtc_h);
-}
-
-/* Preoffset values for YUV to RGB Conversion */
-#define PREOFF_YUV_TO_RGB_HI           0x1800
-#define PREOFF_YUV_TO_RGB_ME           0x1F00
-#define PREOFF_YUV_TO_RGB_LO           0x1800
-
-#define  ROFF(x)          (((x) & 0xffff) << 16)
-#define  GOFF(x)          (((x) & 0xffff) << 0)
-#define  BOFF(x)          (((x) & 0xffff) << 16)
-
-static void
-icl_program_input_csc(struct intel_plane *plane,
-                     const struct intel_crtc_state *crtc_state,
-                     const struct intel_plane_state *plane_state)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       enum pipe pipe = plane->pipe;
-       enum plane_id plane_id = plane->id;
-
-       static const u16 input_csc_matrix[][9] = {
-               /*
-                * BT.601 full range YCbCr -> full range RGB
-                * The matrix required is :
-                * [1.000, 0.000, 1.371,
-                *  1.000, -0.336, -0.698,
-                *  1.000, 1.732, 0.0000]
-                */
-               [DRM_COLOR_YCBCR_BT601] = {
-                       0x7AF8, 0x7800, 0x0,
-                       0x8B28, 0x7800, 0x9AC0,
-                       0x0, 0x7800, 0x7DD8,
-               },
-               /*
-                * BT.709 full range YCbCr -> full range RGB
-                * The matrix required is :
-                * [1.000, 0.000, 1.574,
-                *  1.000, -0.187, -0.468,
-                *  1.000, 1.855, 0.0000]
-                */
-               [DRM_COLOR_YCBCR_BT709] = {
-                       0x7C98, 0x7800, 0x0,
-                       0x9EF8, 0x7800, 0xAC00,
-                       0x0, 0x7800,  0x7ED8,
-               },
-               /*
-                * BT.2020 full range YCbCr -> full range RGB
-                * The matrix required is :
-                * [1.000, 0.000, 1.474,
-                *  1.000, -0.1645, -0.5713,
-                *  1.000, 1.8814, 0.0000]
-                */
-               [DRM_COLOR_YCBCR_BT2020] = {
-                       0x7BC8, 0x7800, 0x0,
-                       0x8928, 0x7800, 0xAA88,
-                       0x0, 0x7800, 0x7F10,
-               },
-       };
-
-       /* Matrix for Limited Range to Full Range Conversion */
-       static const u16 input_csc_matrix_lr[][9] = {
-               /*
-                * BT.601 Limted range YCbCr -> full range RGB
-                * The matrix required is :
-                * [1.164384, 0.000, 1.596027,
-                *  1.164384, -0.39175, -0.812813,
-                *  1.164384, 2.017232, 0.0000]
-                */
-               [DRM_COLOR_YCBCR_BT601] = {
-                       0x7CC8, 0x7950, 0x0,
-                       0x8D00, 0x7950, 0x9C88,
-                       0x0, 0x7950, 0x6810,
-               },
-               /*
-                * BT.709 Limited range YCbCr -> full range RGB
-                * The matrix required is :
-                * [1.164384, 0.000, 1.792741,
-                *  1.164384, -0.213249, -0.532909,
-                *  1.164384, 2.112402, 0.0000]
-                */
-               [DRM_COLOR_YCBCR_BT709] = {
-                       0x7E58, 0x7950, 0x0,
-                       0x8888, 0x7950, 0xADA8,
-                       0x0, 0x7950,  0x6870,
-               },
-               /*
-                * BT.2020 Limited range YCbCr -> full range RGB
-                * The matrix required is :
-                * [1.164, 0.000, 1.678,
-                *  1.164, -0.1873, -0.6504,
-                *  1.164, 2.1417, 0.0000]
-                */
-               [DRM_COLOR_YCBCR_BT2020] = {
-                       0x7D70, 0x7950, 0x0,
-                       0x8A68, 0x7950, 0xAC00,
-                       0x0, 0x7950, 0x6890,
-               },
-       };
-       const u16 *csc;
-
-       if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
-               csc = input_csc_matrix[plane_state->hw.color_encoding];
-       else
-               csc = input_csc_matrix_lr[plane_state->hw.color_encoding];
-
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 0),
-                         ROFF(csc[0]) | GOFF(csc[1]));
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 1),
-                         BOFF(csc[2]));
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 2),
-                         ROFF(csc[3]) | GOFF(csc[4]));
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 3),
-                         BOFF(csc[5]));
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 4),
-                         ROFF(csc[6]) | GOFF(csc[7]));
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_COEFF(pipe, plane_id, 5),
-                         BOFF(csc[8]));
-
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 0),
-                         PREOFF_YUV_TO_RGB_HI);
-       if (plane_state->hw.color_range == DRM_COLOR_YCBCR_FULL_RANGE)
-               intel_de_write_fw(dev_priv,
-                                 PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 1),
-                                 0);
-       else
-               intel_de_write_fw(dev_priv,
-                                 PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 1),
-                                 PREOFF_YUV_TO_RGB_ME);
-       intel_de_write_fw(dev_priv, PLANE_INPUT_CSC_PREOFF(pipe, plane_id, 2),
-                         PREOFF_YUV_TO_RGB_LO);
-       intel_de_write_fw(dev_priv,
-                         PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 0), 0x0);
-       intel_de_write_fw(dev_priv,
-                         PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 1), 0x0);
-       intel_de_write_fw(dev_priv,
-                         PLANE_INPUT_CSC_POSTOFF(pipe, plane_id, 2), 0x0);
-}
-
-static void
-skl_plane_async_flip(struct intel_plane *plane,
-                    const struct intel_crtc_state *crtc_state,
-                    const struct intel_plane_state *plane_state)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       unsigned long irqflags;
-       enum plane_id plane_id = plane->id;
-       enum pipe pipe = plane->pipe;
-       u32 surf_addr = plane_state->color_plane[0].offset;
-       u32 plane_ctl = plane_state->ctl;
-
-       plane_ctl |= skl_plane_ctl_crtc(crtc_state);
-
-       spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-
-       intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
-       intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id),
-                         intel_plane_ggtt_offset(plane_state) + surf_addr);
-
-       spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
-}
-
-static void
-skl_program_plane(struct intel_plane *plane,
-                 const struct intel_crtc_state *crtc_state,
-                 const struct intel_plane_state *plane_state,
-                 int color_plane)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       enum plane_id plane_id = plane->id;
-       enum pipe pipe = plane->pipe;
-       const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
-       u32 surf_addr = plane_state->color_plane[color_plane].offset;
-       u32 stride = skl_plane_stride(plane_state, color_plane);
-       const struct drm_framebuffer *fb = plane_state->hw.fb;
-       int aux_plane = intel_main_to_aux_plane(fb, color_plane);
-       int crtc_x = plane_state->uapi.dst.x1;
-       int crtc_y = plane_state->uapi.dst.y1;
-       u32 x = plane_state->color_plane[color_plane].x;
-       u32 y = plane_state->color_plane[color_plane].y;
-       u32 src_w = drm_rect_width(&plane_state->uapi.src) >> 16;
-       u32 src_h = drm_rect_height(&plane_state->uapi.src) >> 16;
-       u8 alpha = plane_state->hw.alpha >> 8;
-       u32 plane_color_ctl = 0, aux_dist = 0;
-       unsigned long irqflags;
-       u32 keymsk, keymax;
-       u32 plane_ctl = plane_state->ctl;
-
-       plane_ctl |= skl_plane_ctl_crtc(crtc_state);
-
-       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
-               plane_color_ctl = plane_state->color_ctl |
-                       glk_plane_color_ctl_crtc(crtc_state);
-
-       /* Sizes are 0 based */
-       src_w--;
-       src_h--;
-
-       keymax = (key->max_value & 0xffffff) | PLANE_KEYMAX_ALPHA(alpha);
-
-       keymsk = key->channel_mask & 0x7ffffff;
-       if (alpha < 0xff)
-               keymsk |= PLANE_KEYMSK_ALPHA_ENABLE;
-
-       /* The scaler will handle the output position */
-       if (plane_state->scaler_id >= 0) {
-               crtc_x = 0;
-               crtc_y = 0;
-       }
-
-       if (aux_plane) {
-               aux_dist = plane_state->color_plane[aux_plane].offset - 
surf_addr;
-
-               if (INTEL_GEN(dev_priv) < 12)
-                       aux_dist |= skl_plane_stride(plane_state, aux_plane);
-       }
-
-       spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-
-       intel_de_write_fw(dev_priv, PLANE_STRIDE(pipe, plane_id), stride);
-       intel_de_write_fw(dev_priv, PLANE_POS(pipe, plane_id),
-                         (crtc_y << 16) | crtc_x);
-       intel_de_write_fw(dev_priv, PLANE_SIZE(pipe, plane_id),
-                         (src_h << 16) | src_w);
-
-       intel_de_write_fw(dev_priv, PLANE_AUX_DIST(pipe, plane_id), aux_dist);
-
-       if (icl_is_hdr_plane(dev_priv, plane_id))
-               intel_de_write_fw(dev_priv, PLANE_CUS_CTL(pipe, plane_id),
-                                 plane_state->cus_ctl);
-
-       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
-               intel_de_write_fw(dev_priv, PLANE_COLOR_CTL(pipe, plane_id),
-                                 plane_color_ctl);
-
-       if (fb->format->is_yuv && icl_is_hdr_plane(dev_priv, plane_id))
-               icl_program_input_csc(plane, crtc_state, plane_state);
-
-       skl_write_plane_wm(plane, crtc_state);
-
-       intel_de_write_fw(dev_priv, PLANE_KEYVAL(pipe, plane_id),
-                         key->min_value);
-       intel_de_write_fw(dev_priv, PLANE_KEYMSK(pipe, plane_id), keymsk);
-       intel_de_write_fw(dev_priv, PLANE_KEYMAX(pipe, plane_id), keymax);
-
-       intel_de_write_fw(dev_priv, PLANE_OFFSET(pipe, plane_id),
-                         (y << 16) | x);
-
-       if (INTEL_GEN(dev_priv) < 11)
-               intel_de_write_fw(dev_priv, PLANE_AUX_OFFSET(pipe, plane_id),
-                                 (plane_state->color_plane[1].y << 16) | 
plane_state->color_plane[1].x);
-
-       if (!drm_atomic_crtc_needs_modeset(&crtc_state->uapi))
-               intel_psr2_program_plane_sel_fetch(plane, crtc_state, 
plane_state, color_plane);
-
-       /*
-        * The control register self-arms if the plane was previously
-        * disabled. Try to make the plane enable atomic by writing
-        * the control register just before the surface register.
-        */
-       intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), plane_ctl);
-       intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id),
-                         intel_plane_ggtt_offset(plane_state) + surf_addr);
-
-       if (plane_state->scaler_id >= 0)
-               skl_program_scaler(plane, crtc_state, plane_state);
-
-       spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
-}
-
-static void
-skl_update_plane(struct intel_plane *plane,
-                const struct intel_crtc_state *crtc_state,
-                const struct intel_plane_state *plane_state)
-{
-       int color_plane = 0;
-
-       if (plane_state->planar_linked_plane && !plane_state->planar_slave)
-               /* Program the UV plane on planar master */
-               color_plane = 1;
-
-       skl_program_plane(plane, crtc_state, plane_state, color_plane);
-}
-static void
-skl_disable_plane(struct intel_plane *plane,
-                 const struct intel_crtc_state *crtc_state)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       enum plane_id plane_id = plane->id;
-       enum pipe pipe = plane->pipe;
-       unsigned long irqflags;
-
-       spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-
-       if (icl_is_hdr_plane(dev_priv, plane_id))
-               intel_de_write_fw(dev_priv, PLANE_CUS_CTL(pipe, plane_id), 0);
-
-       skl_write_plane_wm(plane, crtc_state);
-
-       intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), 0);
-       intel_de_write_fw(dev_priv, PLANE_SURF(pipe, plane_id), 0);
-
-       spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
-}
-
-static bool
-skl_plane_get_hw_state(struct intel_plane *plane,
-                      enum pipe *pipe)
-{
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       enum intel_display_power_domain power_domain;
-       enum plane_id plane_id = plane->id;
-       intel_wakeref_t wakeref;
-       bool ret;
-
-       power_domain = POWER_DOMAIN_PIPE(plane->pipe);
-       wakeref = intel_display_power_get_if_enabled(dev_priv, power_domain);
-       if (!wakeref)
-               return false;
-
-       ret = intel_de_read(dev_priv, PLANE_CTL(plane->pipe, plane_id)) & 
PLANE_CTL_ENABLE;
-
-       *pipe = plane->pipe;
-
-       intel_display_power_put(dev_priv, power_domain, wakeref);
-
-       return ret;
-}
-
 static void i9xx_plane_linear_gamma(u16 gamma[8])
 {
        /* The points are not evenly spaced. */
@@ -2281,239 +1688,6 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state,
        return 0;
 }
 
-static bool intel_format_is_p01x(u32 format)
-{
-       switch (format) {
-       case DRM_FORMAT_P010:
-       case DRM_FORMAT_P012:
-       case DRM_FORMAT_P016:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
-                             const struct intel_plane_state *plane_state)
-{
-       struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       const struct drm_framebuffer *fb = plane_state->hw.fb;
-       unsigned int rotation = plane_state->hw.rotation;
-       struct drm_format_name_buf format_name;
-
-       if (!fb)
-               return 0;
-
-       if (rotation & ~(DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180) &&
-           is_ccs_modifier(fb->modifier)) {
-               drm_dbg_kms(&dev_priv->drm,
-                           "RC support only with 0/180 degree rotation (%x)\n",
-                           rotation);
-               return -EINVAL;
-       }
-
-       if (rotation & DRM_MODE_REFLECT_X &&
-           fb->modifier == DRM_FORMAT_MOD_LINEAR) {
-               drm_dbg_kms(&dev_priv->drm,
-                           "horizontal flip is not supported with linear 
surface formats\n");
-               return -EINVAL;
-       }
-
-       if (drm_rotation_90_or_270(rotation)) {
-               if (fb->modifier != I915_FORMAT_MOD_Y_TILED &&
-                   fb->modifier != I915_FORMAT_MOD_Yf_TILED) {
-                       drm_dbg_kms(&dev_priv->drm,
-                                   "Y/Yf tiling required for 90/270!\n");
-                       return -EINVAL;
-               }
-
-               /*
-                * 90/270 is not allowed with RGB64 16:16:16:16 and
-                * Indexed 8-bit. RGB 16-bit 5:6:5 is allowed gen11 onwards.
-                */
-               switch (fb->format->format) {
-               case DRM_FORMAT_RGB565:
-                       if (INTEL_GEN(dev_priv) >= 11)
-                               break;
-                       fallthrough;
-               case DRM_FORMAT_C8:
-               case DRM_FORMAT_XRGB16161616F:
-               case DRM_FORMAT_XBGR16161616F:
-               case DRM_FORMAT_ARGB16161616F:
-               case DRM_FORMAT_ABGR16161616F:
-               case DRM_FORMAT_Y210:
-               case DRM_FORMAT_Y212:
-               case DRM_FORMAT_Y216:
-               case DRM_FORMAT_XVYU12_16161616:
-               case DRM_FORMAT_XVYU16161616:
-                       drm_dbg_kms(&dev_priv->drm,
-                                   "Unsupported pixel format %s for 90/270!\n",
-                                   drm_get_format_name(fb->format->format,
-                                                       &format_name));
-                       return -EINVAL;
-               default:
-                       break;
-               }
-       }
-
-       /* Y-tiling is not supported in IF-ID Interlace mode */
-       if (crtc_state->hw.enable &&
-           crtc_state->hw.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE &&
-           (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
-            fb->modifier == I915_FORMAT_MOD_Yf_TILED ||
-            fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
-            fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
-            fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
-            fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS)) {
-               drm_dbg_kms(&dev_priv->drm,
-                           "Y/Yf tiling not supported in IF-ID mode\n");
-               return -EINVAL;
-       }
-
-       /* Wa_1606054188:tgl */
-       if (IS_TIGERLAKE(dev_priv) &&
-           plane_state->ckey.flags & I915_SET_COLORKEY_SOURCE &&
-           intel_format_is_p01x(fb->format->format)) {
-               drm_dbg_kms(&dev_priv->drm,
-                           "Source color keying not supported with P01x 
formats\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static int skl_plane_check_dst_coordinates(const struct intel_crtc_state 
*crtc_state,
-                                          const struct intel_plane_state 
*plane_state)
-{
-       struct drm_i915_private *dev_priv =
-               to_i915(plane_state->uapi.plane->dev);
-       int crtc_x = plane_state->uapi.dst.x1;
-       int crtc_w = drm_rect_width(&plane_state->uapi.dst);
-       int pipe_src_w = crtc_state->pipe_src_w;
-
-       /*
-        * Display WA #1175: cnl,glk
-        * Planes other than the cursor may cause FIFO underflow and display
-        * corruption if starting less than 4 pixels from the right edge of
-        * the screen.
-        * Besides the above WA fix the similar problem, where planes other
-        * than the cursor ending less than 4 pixels from the left edge of the
-        * screen may cause FIFO underflow and display corruption.
-        */
-       if ((IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) &&
-           (crtc_x + crtc_w < 4 || crtc_x > pipe_src_w - 4)) {
-               drm_dbg_kms(&dev_priv->drm,
-                           "requested plane X %s position %d invalid (valid 
range %d-%d)\n",
-                           crtc_x + crtc_w < 4 ? "end" : "start",
-                           crtc_x + crtc_w < 4 ? crtc_x + crtc_w : crtc_x,
-                           4, pipe_src_w - 4);
-               return -ERANGE;
-       }
-
-       return 0;
-}
-
-static int skl_plane_check_nv12_rotation(const struct intel_plane_state 
*plane_state)
-{
-       const struct drm_framebuffer *fb = plane_state->hw.fb;
-       unsigned int rotation = plane_state->hw.rotation;
-       int src_w = drm_rect_width(&plane_state->uapi.src) >> 16;
-
-       /* Display WA #1106 */
-       if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier) &&
-           src_w & 3 &&
-           (rotation == DRM_MODE_ROTATE_270 ||
-            rotation == (DRM_MODE_REFLECT_X | DRM_MODE_ROTATE_90))) {
-               DRM_DEBUG_KMS("src width must be multiple of 4 for rotated 
planar YUV\n");
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
-static int skl_plane_max_scale(struct drm_i915_private *dev_priv,
-                              const struct drm_framebuffer *fb)
-{
-       /*
-        * We don't yet know the final source width nor
-        * whether we can use the HQ scaler mode. Assume
-        * the best case.
-        * FIXME need to properly check this later.
-        */
-       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) ||
-           !intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
-               return 0x30000 - 1;
-       else
-               return 0x20000 - 1;
-}
-
-static int skl_plane_check(struct intel_crtc_state *crtc_state,
-                          struct intel_plane_state *plane_state)
-{
-       struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
-       struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
-       const struct drm_framebuffer *fb = plane_state->hw.fb;
-       int min_scale = DRM_PLANE_HELPER_NO_SCALING;
-       int max_scale = DRM_PLANE_HELPER_NO_SCALING;
-       int ret;
-
-       ret = skl_plane_check_fb(crtc_state, plane_state);
-       if (ret)
-               return ret;
-
-       /* use scaler when colorkey is not required */
-       if (!plane_state->ckey.flags && intel_fb_scalable(fb)) {
-               min_scale = 1;
-               max_scale = skl_plane_max_scale(dev_priv, fb);
-       }
-
-       ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
-                                               min_scale, max_scale, true);
-       if (ret)
-               return ret;
-
-       ret = skl_check_plane_surface(plane_state);
-       if (ret)
-               return ret;
-
-       if (!plane_state->uapi.visible)
-               return 0;
-
-       ret = skl_plane_check_dst_coordinates(crtc_state, plane_state);
-       if (ret)
-               return ret;
-
-       ret = intel_plane_check_src_coordinates(plane_state);
-       if (ret)
-               return ret;
-
-       ret = skl_plane_check_nv12_rotation(plane_state);
-       if (ret)
-               return ret;
-
-       /* HW only has 8 bits pixel precision, disable plane if invisible */
-       if (!(plane_state->hw.alpha >> 8))
-               plane_state->uapi.visible = false;
-
-       plane_state->ctl = skl_plane_ctl(crtc_state, plane_state);
-
-       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
-               plane_state->color_ctl = glk_plane_color_ctl(crtc_state,
-                                                            plane_state);
-
-       if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier) &&
-           icl_is_hdr_plane(dev_priv, plane->id))
-               /* Enable and use MPEG-2 chroma siting */
-               plane_state->cus_ctl = PLANE_CUS_ENABLE |
-                       PLANE_CUS_HPHASE_0 |
-                       PLANE_CUS_VPHASE_SIGN_NEGATIVE | PLANE_CUS_VPHASE_0_25;
-       else
-               plane_state->cus_ctl = 0;
-
-       return 0;
-}
-
 static bool has_dst_key_in_primary_plane(struct drm_i915_private *dev_priv)
 {
        return INTEL_GEN(dev_priv) >= 9;
@@ -2640,169 +1814,41 @@ static const u32 g4x_plane_formats[] = {
        DRM_FORMAT_VYUY,
 };
 
-static const u64 i9xx_plane_format_modifiers[] = {
-       I915_FORMAT_MOD_X_TILED,
-       DRM_FORMAT_MOD_LINEAR,
-       DRM_FORMAT_MOD_INVALID
-};
-
-static const u32 snb_plane_formats[] = {
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_XBGR8888,
-       DRM_FORMAT_XRGB2101010,
-       DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_XRGB16161616F,
-       DRM_FORMAT_XBGR16161616F,
-       DRM_FORMAT_YUYV,
-       DRM_FORMAT_YVYU,
-       DRM_FORMAT_UYVY,
-       DRM_FORMAT_VYUY,
-};
-
-static const u32 vlv_plane_formats[] = {
-       DRM_FORMAT_C8,
-       DRM_FORMAT_RGB565,
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_XBGR8888,
-       DRM_FORMAT_ARGB8888,
-       DRM_FORMAT_ABGR8888,
-       DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_ABGR2101010,
-       DRM_FORMAT_YUYV,
-       DRM_FORMAT_YVYU,
-       DRM_FORMAT_UYVY,
-       DRM_FORMAT_VYUY,
-};
-
-static const u32 chv_pipe_b_sprite_formats[] = {
-       DRM_FORMAT_C8,
-       DRM_FORMAT_RGB565,
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_XBGR8888,
-       DRM_FORMAT_ARGB8888,
-       DRM_FORMAT_ABGR8888,
-       DRM_FORMAT_XRGB2101010,
-       DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_ARGB2101010,
-       DRM_FORMAT_ABGR2101010,
-       DRM_FORMAT_YUYV,
-       DRM_FORMAT_YVYU,
-       DRM_FORMAT_UYVY,
-       DRM_FORMAT_VYUY,
-};
-
-static const u32 skl_plane_formats[] = {
-       DRM_FORMAT_C8,
-       DRM_FORMAT_RGB565,
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_XBGR8888,
-       DRM_FORMAT_ARGB8888,
-       DRM_FORMAT_ABGR8888,
-       DRM_FORMAT_XRGB2101010,
-       DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_XRGB16161616F,
-       DRM_FORMAT_XBGR16161616F,
-       DRM_FORMAT_YUYV,
-       DRM_FORMAT_YVYU,
-       DRM_FORMAT_UYVY,
-       DRM_FORMAT_VYUY,
-       DRM_FORMAT_XYUV8888,
-};
-
-static const u32 skl_planar_formats[] = {
-       DRM_FORMAT_C8,
-       DRM_FORMAT_RGB565,
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_XBGR8888,
-       DRM_FORMAT_ARGB8888,
-       DRM_FORMAT_ABGR8888,
-       DRM_FORMAT_XRGB2101010,
-       DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_XRGB16161616F,
-       DRM_FORMAT_XBGR16161616F,
-       DRM_FORMAT_YUYV,
-       DRM_FORMAT_YVYU,
-       DRM_FORMAT_UYVY,
-       DRM_FORMAT_VYUY,
-       DRM_FORMAT_NV12,
-       DRM_FORMAT_XYUV8888,
-};
-
-static const u32 glk_planar_formats[] = {
-       DRM_FORMAT_C8,
-       DRM_FORMAT_RGB565,
-       DRM_FORMAT_XRGB8888,
-       DRM_FORMAT_XBGR8888,
-       DRM_FORMAT_ARGB8888,
-       DRM_FORMAT_ABGR8888,
-       DRM_FORMAT_XRGB2101010,
-       DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_XRGB16161616F,
-       DRM_FORMAT_XBGR16161616F,
-       DRM_FORMAT_YUYV,
-       DRM_FORMAT_YVYU,
-       DRM_FORMAT_UYVY,
-       DRM_FORMAT_VYUY,
-       DRM_FORMAT_NV12,
-       DRM_FORMAT_XYUV8888,
-       DRM_FORMAT_P010,
-       DRM_FORMAT_P012,
-       DRM_FORMAT_P016,
-};
-
-static const u32 icl_sdr_y_plane_formats[] = {
-       DRM_FORMAT_C8,
-       DRM_FORMAT_RGB565,
+static const u64 i9xx_plane_format_modifiers[] = {
+       I915_FORMAT_MOD_X_TILED,
+       DRM_FORMAT_MOD_LINEAR,
+       DRM_FORMAT_MOD_INVALID
+};
+
+static const u32 snb_plane_formats[] = {
        DRM_FORMAT_XRGB8888,
        DRM_FORMAT_XBGR8888,
-       DRM_FORMAT_ARGB8888,
-       DRM_FORMAT_ABGR8888,
        DRM_FORMAT_XRGB2101010,
        DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_ARGB2101010,
-       DRM_FORMAT_ABGR2101010,
+       DRM_FORMAT_XRGB16161616F,
+       DRM_FORMAT_XBGR16161616F,
        DRM_FORMAT_YUYV,
        DRM_FORMAT_YVYU,
        DRM_FORMAT_UYVY,
        DRM_FORMAT_VYUY,
-       DRM_FORMAT_Y210,
-       DRM_FORMAT_Y212,
-       DRM_FORMAT_Y216,
-       DRM_FORMAT_XYUV8888,
-       DRM_FORMAT_XVYU2101010,
-       DRM_FORMAT_XVYU12_16161616,
-       DRM_FORMAT_XVYU16161616,
 };
 
-static const u32 icl_sdr_uv_plane_formats[] = {
+static const u32 vlv_plane_formats[] = {
        DRM_FORMAT_C8,
        DRM_FORMAT_RGB565,
        DRM_FORMAT_XRGB8888,
        DRM_FORMAT_XBGR8888,
        DRM_FORMAT_ARGB8888,
        DRM_FORMAT_ABGR8888,
-       DRM_FORMAT_XRGB2101010,
        DRM_FORMAT_XBGR2101010,
-       DRM_FORMAT_ARGB2101010,
        DRM_FORMAT_ABGR2101010,
        DRM_FORMAT_YUYV,
        DRM_FORMAT_YVYU,
        DRM_FORMAT_UYVY,
        DRM_FORMAT_VYUY,
-       DRM_FORMAT_NV12,
-       DRM_FORMAT_P010,
-       DRM_FORMAT_P012,
-       DRM_FORMAT_P016,
-       DRM_FORMAT_Y210,
-       DRM_FORMAT_Y212,
-       DRM_FORMAT_Y216,
-       DRM_FORMAT_XYUV8888,
-       DRM_FORMAT_XVYU2101010,
-       DRM_FORMAT_XVYU12_16161616,
-       DRM_FORMAT_XVYU16161616,
 };
 
-static const u32 icl_hdr_plane_formats[] = {
+static const u32 chv_pipe_b_sprite_formats[] = {
        DRM_FORMAT_C8,
        DRM_FORMAT_RGB565,
        DRM_FORMAT_XRGB8888,
@@ -2813,60 +1859,10 @@ static const u32 icl_hdr_plane_formats[] = {
        DRM_FORMAT_XBGR2101010,
        DRM_FORMAT_ARGB2101010,
        DRM_FORMAT_ABGR2101010,
-       DRM_FORMAT_XRGB16161616F,
-       DRM_FORMAT_XBGR16161616F,
-       DRM_FORMAT_ARGB16161616F,
-       DRM_FORMAT_ABGR16161616F,
        DRM_FORMAT_YUYV,
        DRM_FORMAT_YVYU,
        DRM_FORMAT_UYVY,
        DRM_FORMAT_VYUY,
-       DRM_FORMAT_NV12,
-       DRM_FORMAT_P010,
-       DRM_FORMAT_P012,
-       DRM_FORMAT_P016,
-       DRM_FORMAT_Y210,
-       DRM_FORMAT_Y212,
-       DRM_FORMAT_Y216,
-       DRM_FORMAT_XYUV8888,
-       DRM_FORMAT_XVYU2101010,
-       DRM_FORMAT_XVYU12_16161616,
-       DRM_FORMAT_XVYU16161616,
-};
-
-static const u64 skl_plane_format_modifiers_noccs[] = {
-       I915_FORMAT_MOD_Yf_TILED,
-       I915_FORMAT_MOD_Y_TILED,
-       I915_FORMAT_MOD_X_TILED,
-       DRM_FORMAT_MOD_LINEAR,
-       DRM_FORMAT_MOD_INVALID
-};
-
-static const u64 skl_plane_format_modifiers_ccs[] = {
-       I915_FORMAT_MOD_Yf_TILED_CCS,
-       I915_FORMAT_MOD_Y_TILED_CCS,
-       I915_FORMAT_MOD_Yf_TILED,
-       I915_FORMAT_MOD_Y_TILED,
-       I915_FORMAT_MOD_X_TILED,
-       DRM_FORMAT_MOD_LINEAR,
-       DRM_FORMAT_MOD_INVALID
-};
-
-static const u64 gen12_plane_format_modifiers_mc_ccs[] = {
-       I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS,
-       I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
-       I915_FORMAT_MOD_Y_TILED,
-       I915_FORMAT_MOD_X_TILED,
-       DRM_FORMAT_MOD_LINEAR,
-       DRM_FORMAT_MOD_INVALID
-};
-
-static const u64 gen12_plane_format_modifiers_rc_ccs[] = {
-       I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
-       I915_FORMAT_MOD_Y_TILED,
-       I915_FORMAT_MOD_X_TILED,
-       DRM_FORMAT_MOD_LINEAR,
-       DRM_FORMAT_MOD_INVALID
 };
 
 static bool g4x_sprite_format_mod_supported(struct drm_plane *_plane,
@@ -2961,148 +1957,6 @@ static bool vlv_sprite_format_mod_supported(struct 
drm_plane *_plane,
        }
 }
 
-static bool skl_plane_format_mod_supported(struct drm_plane *_plane,
-                                          u32 format, u64 modifier)
-{
-       struct intel_plane *plane = to_intel_plane(_plane);
-
-       switch (modifier) {
-       case DRM_FORMAT_MOD_LINEAR:
-       case I915_FORMAT_MOD_X_TILED:
-       case I915_FORMAT_MOD_Y_TILED:
-       case I915_FORMAT_MOD_Yf_TILED:
-               break;
-       case I915_FORMAT_MOD_Y_TILED_CCS:
-       case I915_FORMAT_MOD_Yf_TILED_CCS:
-               if (!plane->has_ccs)
-                       return false;
-               break;
-       default:
-               return false;
-       }
-
-       switch (format) {
-       case DRM_FORMAT_XRGB8888:
-       case DRM_FORMAT_XBGR8888:
-       case DRM_FORMAT_ARGB8888:
-       case DRM_FORMAT_ABGR8888:
-               if (is_ccs_modifier(modifier))
-                       return true;
-               fallthrough;
-       case DRM_FORMAT_RGB565:
-       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_XVYU2101010:
-               if (modifier == I915_FORMAT_MOD_Yf_TILED)
-                       return true;
-               fallthrough;
-       case DRM_FORMAT_C8:
-       case DRM_FORMAT_XBGR16161616F:
-       case DRM_FORMAT_ABGR16161616F:
-       case DRM_FORMAT_XRGB16161616F:
-       case DRM_FORMAT_ARGB16161616F:
-       case DRM_FORMAT_Y210:
-       case DRM_FORMAT_Y212:
-       case DRM_FORMAT_Y216:
-       case DRM_FORMAT_XVYU12_16161616:
-       case DRM_FORMAT_XVYU16161616:
-               if (modifier == DRM_FORMAT_MOD_LINEAR ||
-                   modifier == I915_FORMAT_MOD_X_TILED ||
-                   modifier == I915_FORMAT_MOD_Y_TILED)
-                       return true;
-               fallthrough;
-       default:
-               return false;
-       }
-}
-
-static bool gen12_plane_supports_mc_ccs(struct drm_i915_private *dev_priv,
-                                       enum plane_id plane_id)
-{
-       /* Wa_14010477008:tgl[a0..c0],rkl[all],dg1[all] */
-       if (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv) ||
-           IS_TGL_DISP_REVID(dev_priv, TGL_REVID_A0, TGL_REVID_C0))
-               return false;
-
-       return plane_id < PLANE_SPRITE4;
-}
-
-static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
-                                            u32 format, u64 modifier)
-{
-       struct drm_i915_private *dev_priv = to_i915(_plane->dev);
-       struct intel_plane *plane = to_intel_plane(_plane);
-
-       switch (modifier) {
-       case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
-               if (!gen12_plane_supports_mc_ccs(dev_priv, plane->id))
-                       return false;
-               fallthrough;
-       case DRM_FORMAT_MOD_LINEAR:
-       case I915_FORMAT_MOD_X_TILED:
-       case I915_FORMAT_MOD_Y_TILED:
-       case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
-               break;
-       default:
-               return false;
-       }
-
-       switch (format) {
-       case DRM_FORMAT_XRGB8888:
-       case DRM_FORMAT_XBGR8888:
-       case DRM_FORMAT_ARGB8888:
-       case DRM_FORMAT_ABGR8888:
-               if (is_ccs_modifier(modifier))
-                       return true;
-               fallthrough;
-       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:
-               if (modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS)
-                       return true;
-               fallthrough;
-       case DRM_FORMAT_RGB565:
-       case DRM_FORMAT_XRGB2101010:
-       case DRM_FORMAT_XBGR2101010:
-       case DRM_FORMAT_ARGB2101010:
-       case DRM_FORMAT_ABGR2101010:
-       case DRM_FORMAT_XVYU2101010:
-       case DRM_FORMAT_C8:
-       case DRM_FORMAT_XBGR16161616F:
-       case DRM_FORMAT_ABGR16161616F:
-       case DRM_FORMAT_XRGB16161616F:
-       case DRM_FORMAT_ARGB16161616F:
-       case DRM_FORMAT_Y210:
-       case DRM_FORMAT_Y212:
-       case DRM_FORMAT_Y216:
-       case DRM_FORMAT_XVYU12_16161616:
-       case DRM_FORMAT_XVYU16161616:
-               if (modifier == DRM_FORMAT_MOD_LINEAR ||
-                   modifier == I915_FORMAT_MOD_X_TILED ||
-                   modifier == I915_FORMAT_MOD_Y_TILED)
-                       return true;
-               fallthrough;
-       default:
-               return false;
-       }
-}
 
 static const struct drm_plane_funcs g4x_sprite_funcs = {
        .update_plane = drm_atomic_helper_update_plane,
@@ -3131,251 +1985,6 @@ static const struct drm_plane_funcs vlv_sprite_funcs = {
        .format_mod_supported = vlv_sprite_format_mod_supported,
 };
 
-static const struct drm_plane_funcs skl_plane_funcs = {
-       .update_plane = drm_atomic_helper_update_plane,
-       .disable_plane = drm_atomic_helper_disable_plane,
-       .destroy = intel_plane_destroy,
-       .atomic_duplicate_state = intel_plane_duplicate_state,
-       .atomic_destroy_state = intel_plane_destroy_state,
-       .format_mod_supported = skl_plane_format_mod_supported,
-};
-
-static const struct drm_plane_funcs gen12_plane_funcs = {
-       .update_plane = drm_atomic_helper_update_plane,
-       .disable_plane = drm_atomic_helper_disable_plane,
-       .destroy = intel_plane_destroy,
-       .atomic_duplicate_state = intel_plane_duplicate_state,
-       .atomic_destroy_state = intel_plane_destroy_state,
-       .format_mod_supported = gen12_plane_format_mod_supported,
-};
-
-static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,
-                             enum pipe pipe, enum plane_id plane_id)
-{
-       if (!HAS_FBC(dev_priv))
-               return false;
-
-       return pipe == PIPE_A && plane_id == PLANE_PRIMARY;
-}
-
-static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
-                                enum pipe pipe, enum plane_id plane_id)
-{
-       /* Display WA #0870: skl, bxt */
-       if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
-               return false;
-
-       if (IS_GEN(dev_priv, 9) && !IS_GEMINILAKE(dev_priv) && pipe == PIPE_C)
-               return false;
-
-       if (plane_id != PLANE_PRIMARY && plane_id != PLANE_SPRITE0)
-               return false;
-
-       return true;
-}
-
-static const u32 *skl_get_plane_formats(struct drm_i915_private *dev_priv,
-                                       enum pipe pipe, enum plane_id plane_id,
-                                       int *num_formats)
-{
-       if (skl_plane_has_planar(dev_priv, pipe, plane_id)) {
-               *num_formats = ARRAY_SIZE(skl_planar_formats);
-               return skl_planar_formats;
-       } else {
-               *num_formats = ARRAY_SIZE(skl_plane_formats);
-               return skl_plane_formats;
-       }
-}
-
-static const u32 *glk_get_plane_formats(struct drm_i915_private *dev_priv,
-                                       enum pipe pipe, enum plane_id plane_id,
-                                       int *num_formats)
-{
-       if (skl_plane_has_planar(dev_priv, pipe, plane_id)) {
-               *num_formats = ARRAY_SIZE(glk_planar_formats);
-               return glk_planar_formats;
-       } else {
-               *num_formats = ARRAY_SIZE(skl_plane_formats);
-               return skl_plane_formats;
-       }
-}
-
-static const u32 *icl_get_plane_formats(struct drm_i915_private *dev_priv,
-                                       enum pipe pipe, enum plane_id plane_id,
-                                       int *num_formats)
-{
-       if (icl_is_hdr_plane(dev_priv, plane_id)) {
-               *num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
-               return icl_hdr_plane_formats;
-       } else if (icl_is_nv12_y_plane(dev_priv, plane_id)) {
-               *num_formats = ARRAY_SIZE(icl_sdr_y_plane_formats);
-               return icl_sdr_y_plane_formats;
-       } else {
-               *num_formats = ARRAY_SIZE(icl_sdr_uv_plane_formats);
-               return icl_sdr_uv_plane_formats;
-       }
-}
-
-static const u64 *gen12_get_plane_modifiers(struct drm_i915_private *dev_priv,
-                                           enum plane_id plane_id)
-{
-       if (gen12_plane_supports_mc_ccs(dev_priv, plane_id))
-               return gen12_plane_format_modifiers_mc_ccs;
-       else
-               return gen12_plane_format_modifiers_rc_ccs;
-}
-
-static bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
-                             enum pipe pipe, enum plane_id plane_id)
-{
-       if (plane_id == PLANE_CURSOR)
-               return false;
-
-       if (INTEL_GEN(dev_priv) >= 10)
-               return true;
-
-       if (IS_GEMINILAKE(dev_priv))
-               return pipe != PIPE_C;
-
-       return pipe != PIPE_C &&
-               (plane_id == PLANE_PRIMARY ||
-                plane_id == PLANE_SPRITE0);
-}
-
-struct intel_plane *
-skl_universal_plane_create(struct drm_i915_private *dev_priv,
-                          enum pipe pipe, enum plane_id plane_id)
-{
-       const struct drm_plane_funcs *plane_funcs;
-       struct intel_plane *plane;
-       enum drm_plane_type plane_type;
-       unsigned int supported_rotations;
-       unsigned int supported_csc;
-       const u64 *modifiers;
-       const u32 *formats;
-       int num_formats;
-       int ret;
-
-       plane = intel_plane_alloc();
-       if (IS_ERR(plane))
-               return plane;
-
-       plane->pipe = pipe;
-       plane->id = plane_id;
-       plane->frontbuffer_bit = INTEL_FRONTBUFFER(pipe, plane_id);
-
-       plane->has_fbc = skl_plane_has_fbc(dev_priv, pipe, plane_id);
-       if (plane->has_fbc) {
-               struct intel_fbc *fbc = &dev_priv->fbc;
-
-               fbc->possible_framebuffer_bits |= plane->frontbuffer_bit;
-       }
-
-       if (INTEL_GEN(dev_priv) >= 11) {
-               plane->min_width = icl_plane_min_width;
-               plane->max_width = icl_plane_max_width;
-               plane->max_height = icl_plane_max_height;
-       } else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
-               plane->max_width = glk_plane_max_width;
-               plane->max_height = skl_plane_max_height;
-       } else {
-               plane->max_width = skl_plane_max_width;
-               plane->max_height = skl_plane_max_height;
-       }
-
-       plane->max_stride = skl_plane_max_stride;
-       plane->update_plane = skl_update_plane;
-       plane->disable_plane = skl_disable_plane;
-       plane->get_hw_state = skl_plane_get_hw_state;
-       plane->check_plane = skl_plane_check;
-       plane->min_cdclk = skl_plane_min_cdclk;
-       plane->async_flip = skl_plane_async_flip;
-
-       if (INTEL_GEN(dev_priv) >= 11)
-               formats = icl_get_plane_formats(dev_priv, pipe,
-                                               plane_id, &num_formats);
-       else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
-               formats = glk_get_plane_formats(dev_priv, pipe,
-                                               plane_id, &num_formats);
-       else
-               formats = skl_get_plane_formats(dev_priv, pipe,
-                                               plane_id, &num_formats);
-
-       plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, plane_id);
-       if (INTEL_GEN(dev_priv) >= 12) {
-               modifiers = gen12_get_plane_modifiers(dev_priv, plane_id);
-               plane_funcs = &gen12_plane_funcs;
-       } else {
-               if (plane->has_ccs)
-                       modifiers = skl_plane_format_modifiers_ccs;
-               else
-                       modifiers = skl_plane_format_modifiers_noccs;
-               plane_funcs = &skl_plane_funcs;
-       }
-
-       if (plane_id == PLANE_PRIMARY)
-               plane_type = DRM_PLANE_TYPE_PRIMARY;
-       else
-               plane_type = DRM_PLANE_TYPE_OVERLAY;
-
-       ret = drm_universal_plane_init(&dev_priv->drm, &plane->base,
-                                      0, plane_funcs,
-                                      formats, num_formats, modifiers,
-                                      plane_type,
-                                      "plane %d%c", plane_id + 1,
-                                      pipe_name(pipe));
-       if (ret)
-               goto fail;
-
-       supported_rotations =
-               DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |
-               DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;
-
-       if (INTEL_GEN(dev_priv) >= 10)
-               supported_rotations |= DRM_MODE_REFLECT_X;
-
-       drm_plane_create_rotation_property(&plane->base,
-                                          DRM_MODE_ROTATE_0,
-                                          supported_rotations);
-
-       supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709);
-
-       if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
-               supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020);
-
-       drm_plane_create_color_properties(&plane->base,
-                                         supported_csc,
-                                         BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
-                                         BIT(DRM_COLOR_YCBCR_FULL_RANGE),
-                                         DRM_COLOR_YCBCR_BT709,
-                                         DRM_COLOR_YCBCR_LIMITED_RANGE);
-
-       drm_plane_create_alpha_property(&plane->base);
-       drm_plane_create_blend_mode_property(&plane->base,
-                                            BIT(DRM_MODE_BLEND_PIXEL_NONE) |
-                                            BIT(DRM_MODE_BLEND_PREMULTI) |
-                                            BIT(DRM_MODE_BLEND_COVERAGE));
-
-       drm_plane_create_zpos_immutable_property(&plane->base, plane_id);
-
-       if (INTEL_GEN(dev_priv) >= 12)
-               drm_plane_enable_fb_damage_clips(&plane->base);
-
-       if (INTEL_GEN(dev_priv) >= 10)
-               drm_plane_create_scaling_filter_property(&plane->base,
-                                               BIT(DRM_SCALING_FILTER_DEFAULT) 
|
-                                               
BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
-
-       drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);
-
-       return plane;
-
-fail:
-       intel_plane_free(plane);
-
-       return ERR_PTR(ret);
-}
-
 struct intel_plane *
 intel_sprite_plane_create(struct drm_i915_private *dev_priv,
                          enum pipe pipe, int sprite)
@@ -3388,10 +1997,6 @@ intel_sprite_plane_create(struct drm_i915_private 
*dev_priv,
        int num_formats;
        int ret, zpos;
 
-       if (INTEL_GEN(dev_priv) >= 9)
-               return skl_universal_plane_create(dev_priv, pipe,
-                                                 PLANE_SPRITE0 + sprite);
-
        plane = intel_plane_alloc();
        if (IS_ERR(plane))
                return plane;
-- 
2.27.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to