]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/i915: refactor some crtc code out of intel display. (v2)
authorDave Airlie <airlied@redhat.com>
Thu, 14 Jan 2021 11:13:45 +0000 (13:13 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 15 Jan 2021 22:08:58 +0000 (00:08 +0200)
There may be more crtc code that can be pulled out, but this
is a good start.

v2: move plane before this.

Signed-off-by: Dave Airlie <airlied@redhat.com>
[Jani: cleaned up intel_crtc.h a bit.]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/eacbe964f90d189c5940c12af5e09091b37a19c3.1610622609.git.jani.nikula@intel.com
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/display/intel_crtc.c [new file with mode: 0644]
drivers/gpu/drm/i915/display/intel_crtc.h [new file with mode: 0644]
drivers/gpu/drm/i915/display/intel_display.c

index 80b4429ce993177d547ca49a03ff7263432aaafa..6354b13b03466e8b6321efe6b3d39deb4c8c4cf6 100644 (file)
@@ -196,6 +196,7 @@ i915-y += \
        display/intel_color.o \
        display/intel_combo_phy.o \
        display/intel_connector.o \
+       display/intel_crtc.o \
        display/intel_csr.o \
        display/intel_cursor.o \
        display/intel_display.o \
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
new file mode 100644 (file)
index 0000000..57b0a3e
--- /dev/null
@@ -0,0 +1,325 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+#include <linux/kernel.h>
+#include <linux/slab.h>
+
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_plane.h>
+#include <drm/drm_plane_helper.h>
+
+#include "intel_atomic.h"
+#include "intel_atomic_plane.h"
+#include "intel_color.h"
+#include "intel_crtc.h"
+#include "intel_cursor.h"
+#include "intel_display_debugfs.h"
+#include "intel_display_types.h"
+#include "intel_pipe_crc.h"
+#include "intel_sprite.h"
+#include "i9xx_plane.h"
+
+static void assert_vblank_disabled(struct drm_crtc *crtc)
+{
+       if (I915_STATE_WARN_ON(drm_crtc_vblank_get(crtc) == 0))
+               drm_crtc_vblank_put(crtc);
+}
+
+u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)
+{
+       struct drm_device *dev = crtc->base.dev;
+       struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index(&crtc->base)];
+
+       if (!vblank->max_vblank_count)
+               return (u32)drm_crtc_accurate_vblank_count(&crtc->base);
+
+       return crtc->base.funcs->get_vblank_counter(&crtc->base);
+}
+
+u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_state)
+{
+       struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+       u32 mode_flags = crtc->mode_flags;
+
+       /*
+        * From Gen 11, In case of dsi cmd mode, frame counter wouldnt
+        * have updated at the beginning of TE, if we want to use
+        * the hw counter, then we would find it updated in only
+        * the next TE, hence switching to sw counter.
+        */
+       if (mode_flags & (I915_MODE_FLAG_DSI_USE_TE0 | I915_MODE_FLAG_DSI_USE_TE1))
+               return 0;
+
+       /*
+        * On i965gm the hardware frame counter reads
+        * zero when the TV encoder is enabled :(
+        */
+       if (IS_I965GM(dev_priv) &&
+           (crtc_state->output_types & BIT(INTEL_OUTPUT_TVOUT)))
+               return 0;
+
+       if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
+               return 0xffffffff; /* full 32 bit counter */
+       else if (INTEL_GEN(dev_priv) >= 3)
+               return 0xffffff; /* only 24 bits of frame count */
+       else
+               return 0; /* Gen2 doesn't have a hardware frame counter */
+}
+
+void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+
+       assert_vblank_disabled(&crtc->base);
+       drm_crtc_set_max_vblank_count(&crtc->base,
+                                     intel_crtc_max_vblank_count(crtc_state));
+       drm_crtc_vblank_on(&crtc->base);
+}
+
+void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state)
+{
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
+
+       drm_crtc_vblank_off(&crtc->base);
+       assert_vblank_disabled(&crtc->base);
+}
+
+struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc)
+{
+       struct intel_crtc_state *crtc_state;
+
+       crtc_state = kmalloc(sizeof(*crtc_state), GFP_KERNEL);
+
+       if (crtc_state)
+               intel_crtc_state_reset(crtc_state, crtc);
+
+       return crtc_state;
+}
+
+void intel_crtc_state_reset(struct intel_crtc_state *crtc_state,
+                           struct intel_crtc *crtc)
+{
+       memset(crtc_state, 0, sizeof(*crtc_state));
+
+       __drm_atomic_helper_crtc_state_reset(&crtc_state->uapi, &crtc->base);
+
+       crtc_state->cpu_transcoder = INVALID_TRANSCODER;
+       crtc_state->master_transcoder = INVALID_TRANSCODER;
+       crtc_state->hsw_workaround_pipe = INVALID_PIPE;
+       crtc_state->output_format = INTEL_OUTPUT_FORMAT_INVALID;
+       crtc_state->scaler_state.scaler_id = -1;
+       crtc_state->mst_master_transcoder = INVALID_TRANSCODER;
+}
+
+static struct intel_crtc *intel_crtc_alloc(void)
+{
+       struct intel_crtc_state *crtc_state;
+       struct intel_crtc *crtc;
+
+       crtc = kzalloc(sizeof(*crtc), GFP_KERNEL);
+       if (!crtc)
+               return ERR_PTR(-ENOMEM);
+
+       crtc_state = intel_crtc_state_alloc(crtc);
+       if (!crtc_state) {
+               kfree(crtc);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       crtc->base.state = &crtc_state->uapi;
+       crtc->config = crtc_state;
+
+       return crtc;
+}
+
+static void intel_crtc_free(struct intel_crtc *crtc)
+{
+       intel_crtc_destroy_state(&crtc->base, crtc->base.state);
+       kfree(crtc);
+}
+
+static void intel_crtc_destroy(struct drm_crtc *crtc)
+{
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+
+       drm_crtc_cleanup(crtc);
+       kfree(intel_crtc);
+}
+
+static int intel_crtc_late_register(struct drm_crtc *crtc)
+{
+       intel_crtc_debugfs_add(crtc);
+       return 0;
+}
+
+#define INTEL_CRTC_FUNCS \
+       .set_config = drm_atomic_helper_set_config, \
+       .destroy = intel_crtc_destroy, \
+       .page_flip = drm_atomic_helper_page_flip, \
+       .atomic_duplicate_state = intel_crtc_duplicate_state, \
+       .atomic_destroy_state = intel_crtc_destroy_state, \
+       .set_crc_source = intel_crtc_set_crc_source, \
+       .verify_crc_source = intel_crtc_verify_crc_source, \
+       .get_crc_sources = intel_crtc_get_crc_sources, \
+       .late_register = intel_crtc_late_register
+
+static const struct drm_crtc_funcs bdw_crtc_funcs = {
+       INTEL_CRTC_FUNCS,
+
+       .get_vblank_counter = g4x_get_vblank_counter,
+       .enable_vblank = bdw_enable_vblank,
+       .disable_vblank = bdw_disable_vblank,
+       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
+};
+
+static const struct drm_crtc_funcs ilk_crtc_funcs = {
+       INTEL_CRTC_FUNCS,
+
+       .get_vblank_counter = g4x_get_vblank_counter,
+       .enable_vblank = ilk_enable_vblank,
+       .disable_vblank = ilk_disable_vblank,
+       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
+};
+
+static const struct drm_crtc_funcs g4x_crtc_funcs = {
+       INTEL_CRTC_FUNCS,
+
+       .get_vblank_counter = g4x_get_vblank_counter,
+       .enable_vblank = i965_enable_vblank,
+       .disable_vblank = i965_disable_vblank,
+       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
+};
+
+static const struct drm_crtc_funcs i965_crtc_funcs = {
+       INTEL_CRTC_FUNCS,
+
+       .get_vblank_counter = i915_get_vblank_counter,
+       .enable_vblank = i965_enable_vblank,
+       .disable_vblank = i965_disable_vblank,
+       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
+};
+
+static const struct drm_crtc_funcs i915gm_crtc_funcs = {
+       INTEL_CRTC_FUNCS,
+
+       .get_vblank_counter = i915_get_vblank_counter,
+       .enable_vblank = i915gm_enable_vblank,
+       .disable_vblank = i915gm_disable_vblank,
+       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
+};
+
+static const struct drm_crtc_funcs i915_crtc_funcs = {
+       INTEL_CRTC_FUNCS,
+
+       .get_vblank_counter = i915_get_vblank_counter,
+       .enable_vblank = i8xx_enable_vblank,
+       .disable_vblank = i8xx_disable_vblank,
+       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
+};
+
+static const struct drm_crtc_funcs i8xx_crtc_funcs = {
+       INTEL_CRTC_FUNCS,
+
+       /* no hw vblank counter */
+       .enable_vblank = i8xx_enable_vblank,
+       .disable_vblank = i8xx_disable_vblank,
+       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
+};
+
+int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
+{
+       struct intel_plane *primary, *cursor;
+       const struct drm_crtc_funcs *funcs;
+       struct intel_crtc *crtc;
+       int sprite, ret;
+
+       crtc = intel_crtc_alloc();
+       if (IS_ERR(crtc))
+               return PTR_ERR(crtc);
+
+       crtc->pipe = pipe;
+       crtc->num_scalers = RUNTIME_INFO(dev_priv)->num_scalers[pipe];
+
+       primary = intel_primary_plane_create(dev_priv, pipe);
+       if (IS_ERR(primary)) {
+               ret = PTR_ERR(primary);
+               goto fail;
+       }
+       crtc->plane_ids_mask |= BIT(primary->id);
+
+       for_each_sprite(dev_priv, pipe, sprite) {
+               struct intel_plane *plane;
+
+               plane = intel_sprite_plane_create(dev_priv, pipe, sprite);
+               if (IS_ERR(plane)) {
+                       ret = PTR_ERR(plane);
+                       goto fail;
+               }
+               crtc->plane_ids_mask |= BIT(plane->id);
+       }
+
+       cursor = intel_cursor_plane_create(dev_priv, pipe);
+       if (IS_ERR(cursor)) {
+               ret = PTR_ERR(cursor);
+               goto fail;
+       }
+       crtc->plane_ids_mask |= BIT(cursor->id);
+
+       if (HAS_GMCH(dev_priv)) {
+               if (IS_CHERRYVIEW(dev_priv) ||
+                   IS_VALLEYVIEW(dev_priv) || IS_G4X(dev_priv))
+                       funcs = &g4x_crtc_funcs;
+               else if (IS_GEN(dev_priv, 4))
+                       funcs = &i965_crtc_funcs;
+               else if (IS_I945GM(dev_priv) || IS_I915GM(dev_priv))
+                       funcs = &i915gm_crtc_funcs;
+               else if (IS_GEN(dev_priv, 3))
+                       funcs = &i915_crtc_funcs;
+               else
+                       funcs = &i8xx_crtc_funcs;
+       } else {
+               if (INTEL_GEN(dev_priv) >= 8)
+                       funcs = &bdw_crtc_funcs;
+               else
+                       funcs = &ilk_crtc_funcs;
+       }
+
+       ret = drm_crtc_init_with_planes(&dev_priv->drm, &crtc->base,
+                                       &primary->base, &cursor->base,
+                                       funcs, "pipe %c", pipe_name(pipe));
+       if (ret)
+               goto fail;
+
+       BUG_ON(pipe >= ARRAY_SIZE(dev_priv->pipe_to_crtc_mapping) ||
+              dev_priv->pipe_to_crtc_mapping[pipe] != NULL);
+       dev_priv->pipe_to_crtc_mapping[pipe] = crtc;
+
+       if (INTEL_GEN(dev_priv) < 9) {
+               enum i9xx_plane_id i9xx_plane = primary->i9xx_plane;
+
+               BUG_ON(i9xx_plane >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||
+                      dev_priv->plane_to_crtc_mapping[i9xx_plane] != NULL);
+               dev_priv->plane_to_crtc_mapping[i9xx_plane] = crtc;
+       }
+
+       if (INTEL_GEN(dev_priv) >= 10)
+               drm_crtc_create_scaling_filter_property(&crtc->base,
+                                               BIT(DRM_SCALING_FILTER_DEFAULT) |
+                                               BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
+
+       intel_color_init(crtc);
+
+       intel_crtc_crc_init(crtc);
+
+       drm_WARN_ON(&dev_priv->drm, drm_crtc_index(&crtc->base) != crtc->pipe);
+
+       return 0;
+
+fail:
+       intel_crtc_free(crtc);
+
+       return ret;
+}
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.h b/drivers/gpu/drm/i915/display/intel_crtc.h
new file mode 100644 (file)
index 0000000..08112d5
--- /dev/null
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2020 Intel Corporation
+ */
+
+#ifndef _INTEL_CRTC_H_
+#define _INTEL_CRTC_H_
+
+#include <linux/types.h>
+
+enum pipe;
+struct drm_i915_private;
+struct intel_crtc;
+struct intel_crtc_state;
+
+u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_state);
+int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe);
+struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc);
+void intel_crtc_state_reset(struct intel_crtc_state *crtc_state,
+                           struct intel_crtc *crtc);
+
+#endif
index 66990e48c0d4972b974b6bbd16bcdaf2c5be322d..f27759a9211696002c70f45817c2aedbeafd6bdd 100644 (file)
@@ -68,8 +68,8 @@
 #include "intel_bw.h"
 #include "intel_cdclk.h"
 #include "intel_color.h"
+#include "intel_crtc.h"
 #include "intel_csr.h"
-#include "intel_cursor.h"
 #include "intel_display_types.h"
 #include "intel_dp_link_training.h"
 #include "intel_fbc.h"
@@ -114,7 +114,6 @@ static void skl_pfit_enable(const struct intel_crtc_state *crtc_state);
 static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state);
 static void intel_modeset_setup_hw_state(struct drm_device *dev,
                                         struct drm_modeset_acquire_ctx *ctx);
-static struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc);
 
 struct intel_limit {
        struct {
@@ -1253,12 +1252,6 @@ static void assert_planes_disabled(struct intel_crtc *crtc)
                assert_plane_disabled(plane);
 }
 
-static void assert_vblank_disabled(struct drm_crtc *crtc)
-{
-       if (I915_STATE_WARN_ON(drm_crtc_vblank_get(crtc) == 0))
-               drm_crtc_vblank_put(crtc);
-}
-
 void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,
                                    enum pipe pipe)
 {
@@ -1743,55 +1736,6 @@ enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc)
                return crtc->pipe;
 }
 
-static u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_state)
-{
-       struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
-       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-       u32 mode_flags = crtc->mode_flags;
-
-       /*
-        * From Gen 11, In case of dsi cmd mode, frame counter wouldnt
-        * have updated at the beginning of TE, if we want to use
-        * the hw counter, then we would find it updated in only
-        * the next TE, hence switching to sw counter.
-        */
-       if (mode_flags & (I915_MODE_FLAG_DSI_USE_TE0 | I915_MODE_FLAG_DSI_USE_TE1))
-               return 0;
-
-       /*
-        * On i965gm the hardware frame counter reads
-        * zero when the TV encoder is enabled :(
-        */
-       if (IS_I965GM(dev_priv) &&
-           (crtc_state->output_types & BIT(INTEL_OUTPUT_TVOUT)))
-               return 0;
-
-       if (INTEL_GEN(dev_priv) >= 5 || IS_G4X(dev_priv))
-               return 0xffffffff; /* full 32 bit counter */
-       else if (INTEL_GEN(dev_priv) >= 3)
-               return 0xffffff; /* only 24 bits of frame count */
-       else
-               return 0; /* Gen2 doesn't have a hardware frame counter */
-}
-
-void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state)
-{
-       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-
-       assert_vblank_disabled(&crtc->base);
-       drm_crtc_set_max_vblank_count(&crtc->base,
-                                     intel_crtc_max_vblank_count(crtc_state));
-       drm_crtc_vblank_on(&crtc->base);
-}
-
-void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state)
-{
-       struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
-
-       drm_crtc_vblank_off(&crtc->base);
-       assert_vblank_disabled(&crtc->base);
-}
-
 void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)
 {
        struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
@@ -11462,33 +11406,6 @@ static void ilk_pch_clock_get(struct intel_crtc *crtc,
                                         &pipe_config->fdi_m_n);
 }
 
-static void intel_crtc_state_reset(struct intel_crtc_state *crtc_state,
-                                  struct intel_crtc *crtc)
-{
-       memset(crtc_state, 0, sizeof(*crtc_state));
-
-       __drm_atomic_helper_crtc_state_reset(&crtc_state->uapi, &crtc->base);
-
-       crtc_state->cpu_transcoder = INVALID_TRANSCODER;
-       crtc_state->master_transcoder = INVALID_TRANSCODER;
-       crtc_state->hsw_workaround_pipe = INVALID_PIPE;
-       crtc_state->output_format = INTEL_OUTPUT_FORMAT_INVALID;
-       crtc_state->scaler_state.scaler_id = -1;
-       crtc_state->mst_master_transcoder = INVALID_TRANSCODER;
-}
-
-static struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc)
-{
-       struct intel_crtc_state *crtc_state;
-
-       crtc_state = kmalloc(sizeof(*crtc_state), GFP_KERNEL);
-
-       if (crtc_state)
-               intel_crtc_state_reset(crtc_state, crtc);
-
-       return crtc_state;
-}
-
 /* Returns the currently programmed mode of the given encoder. */
 struct drm_display_mode *
 intel_encoder_current_mode(struct intel_encoder *encoder)
@@ -11529,14 +11446,6 @@ intel_encoder_current_mode(struct intel_encoder *encoder)
        return mode;
 }
 
-static void intel_crtc_destroy(struct drm_crtc *crtc)
-{
-       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-
-       drm_crtc_cleanup(crtc);
-       kfree(intel_crtc);
-}
-
 /**
  * intel_wm_need_update - Check whether watermarks need updating
  * @cur: current plane state
@@ -14740,17 +14649,6 @@ static int intel_atomic_prepare_commit(struct intel_atomic_state *state)
        return 0;
 }
 
-u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)
-{
-       struct drm_device *dev = crtc->base.dev;
-       struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index(&crtc->base)];
-
-       if (!vblank->max_vblank_count)
-               return (u32)drm_crtc_accurate_vblank_count(&crtc->base);
-
-       return crtc->base.funcs->get_vblank_counter(&crtc->base);
-}
-
 void intel_crtc_arm_fifo_underrun(struct intel_crtc *crtc,
                                  struct intel_crtc_state *crtc_state)
 {
@@ -15803,113 +15701,6 @@ void intel_plane_destroy(struct drm_plane *plane)
        kfree(to_intel_plane(plane));
 }
 
-static int intel_crtc_late_register(struct drm_crtc *crtc)
-{
-       intel_crtc_debugfs_add(crtc);
-       return 0;
-}
-
-#define INTEL_CRTC_FUNCS \
-       .set_config = drm_atomic_helper_set_config, \
-       .destroy = intel_crtc_destroy, \
-       .page_flip = drm_atomic_helper_page_flip, \
-       .atomic_duplicate_state = intel_crtc_duplicate_state, \
-       .atomic_destroy_state = intel_crtc_destroy_state, \
-       .set_crc_source = intel_crtc_set_crc_source, \
-       .verify_crc_source = intel_crtc_verify_crc_source, \
-       .get_crc_sources = intel_crtc_get_crc_sources, \
-       .late_register = intel_crtc_late_register
-
-static const struct drm_crtc_funcs bdw_crtc_funcs = {
-       INTEL_CRTC_FUNCS,
-
-       .get_vblank_counter = g4x_get_vblank_counter,
-       .enable_vblank = bdw_enable_vblank,
-       .disable_vblank = bdw_disable_vblank,
-       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
-};
-
-static const struct drm_crtc_funcs ilk_crtc_funcs = {
-       INTEL_CRTC_FUNCS,
-
-       .get_vblank_counter = g4x_get_vblank_counter,
-       .enable_vblank = ilk_enable_vblank,
-       .disable_vblank = ilk_disable_vblank,
-       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
-};
-
-static const struct drm_crtc_funcs g4x_crtc_funcs = {
-       INTEL_CRTC_FUNCS,
-
-       .get_vblank_counter = g4x_get_vblank_counter,
-       .enable_vblank = i965_enable_vblank,
-       .disable_vblank = i965_disable_vblank,
-       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
-};
-
-static const struct drm_crtc_funcs i965_crtc_funcs = {
-       INTEL_CRTC_FUNCS,
-
-       .get_vblank_counter = i915_get_vblank_counter,
-       .enable_vblank = i965_enable_vblank,
-       .disable_vblank = i965_disable_vblank,
-       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
-};
-
-static const struct drm_crtc_funcs i915gm_crtc_funcs = {
-       INTEL_CRTC_FUNCS,
-
-       .get_vblank_counter = i915_get_vblank_counter,
-       .enable_vblank = i915gm_enable_vblank,
-       .disable_vblank = i915gm_disable_vblank,
-       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
-};
-
-static const struct drm_crtc_funcs i915_crtc_funcs = {
-       INTEL_CRTC_FUNCS,
-
-       .get_vblank_counter = i915_get_vblank_counter,
-       .enable_vblank = i8xx_enable_vblank,
-       .disable_vblank = i8xx_disable_vblank,
-       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
-};
-
-static const struct drm_crtc_funcs i8xx_crtc_funcs = {
-       INTEL_CRTC_FUNCS,
-
-       /* no hw vblank counter */
-       .enable_vblank = i8xx_enable_vblank,
-       .disable_vblank = i8xx_disable_vblank,
-       .get_vblank_timestamp = intel_crtc_get_vblank_timestamp,
-};
-
-static struct intel_crtc *intel_crtc_alloc(void)
-{
-       struct intel_crtc_state *crtc_state;
-       struct intel_crtc *crtc;
-
-       crtc = kzalloc(sizeof(*crtc), GFP_KERNEL);
-       if (!crtc)
-               return ERR_PTR(-ENOMEM);
-
-       crtc_state = intel_crtc_state_alloc(crtc);
-       if (!crtc_state) {
-               kfree(crtc);
-               return ERR_PTR(-ENOMEM);
-       }
-
-       crtc->base.state = &crtc_state->uapi;
-       crtc->config = crtc_state;
-
-       return crtc;
-}
-
-static void intel_crtc_free(struct intel_crtc *crtc)
-{
-       intel_crtc_destroy_state(&crtc->base, crtc->base.state);
-       kfree(crtc);
-}
-
 static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv)
 {
        struct intel_plane *plane;
@@ -15922,100 +15713,6 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv)
        }
 }
 
-static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
-{
-       struct intel_plane *primary, *cursor;
-       const struct drm_crtc_funcs *funcs;
-       struct intel_crtc *crtc;
-       int sprite, ret;
-
-       crtc = intel_crtc_alloc();
-       if (IS_ERR(crtc))
-               return PTR_ERR(crtc);
-
-       crtc->pipe = pipe;
-       crtc->num_scalers = RUNTIME_INFO(dev_priv)->num_scalers[pipe];
-
-       primary = intel_primary_plane_create(dev_priv, pipe);
-       if (IS_ERR(primary)) {
-               ret = PTR_ERR(primary);
-               goto fail;
-       }
-       crtc->plane_ids_mask |= BIT(primary->id);
-
-       for_each_sprite(dev_priv, pipe, sprite) {
-               struct intel_plane *plane;
-
-               plane = intel_sprite_plane_create(dev_priv, pipe, sprite);
-               if (IS_ERR(plane)) {
-                       ret = PTR_ERR(plane);
-                       goto fail;
-               }
-               crtc->plane_ids_mask |= BIT(plane->id);
-       }
-
-       cursor = intel_cursor_plane_create(dev_priv, pipe);
-       if (IS_ERR(cursor)) {
-               ret = PTR_ERR(cursor);
-               goto fail;
-       }
-       crtc->plane_ids_mask |= BIT(cursor->id);
-
-       if (HAS_GMCH(dev_priv)) {
-               if (IS_CHERRYVIEW(dev_priv) ||
-                   IS_VALLEYVIEW(dev_priv) || IS_G4X(dev_priv))
-                       funcs = &g4x_crtc_funcs;
-               else if (IS_GEN(dev_priv, 4))
-                       funcs = &i965_crtc_funcs;
-               else if (IS_I945GM(dev_priv) || IS_I915GM(dev_priv))
-                       funcs = &i915gm_crtc_funcs;
-               else if (IS_GEN(dev_priv, 3))
-                       funcs = &i915_crtc_funcs;
-               else
-                       funcs = &i8xx_crtc_funcs;
-       } else {
-               if (INTEL_GEN(dev_priv) >= 8)
-                       funcs = &bdw_crtc_funcs;
-               else
-                       funcs = &ilk_crtc_funcs;
-       }
-
-       ret = drm_crtc_init_with_planes(&dev_priv->drm, &crtc->base,
-                                       &primary->base, &cursor->base,
-                                       funcs, "pipe %c", pipe_name(pipe));
-       if (ret)
-               goto fail;
-
-       BUG_ON(pipe >= ARRAY_SIZE(dev_priv->pipe_to_crtc_mapping) ||
-              dev_priv->pipe_to_crtc_mapping[pipe] != NULL);
-       dev_priv->pipe_to_crtc_mapping[pipe] = crtc;
-
-       if (INTEL_GEN(dev_priv) < 9) {
-               enum i9xx_plane_id i9xx_plane = primary->i9xx_plane;
-
-               BUG_ON(i9xx_plane >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||
-                      dev_priv->plane_to_crtc_mapping[i9xx_plane] != NULL);
-               dev_priv->plane_to_crtc_mapping[i9xx_plane] = crtc;
-       }
-
-       if (INTEL_GEN(dev_priv) >= 10)
-               drm_crtc_create_scaling_filter_property(&crtc->base,
-                                               BIT(DRM_SCALING_FILTER_DEFAULT) |
-                                               BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
-
-       intel_color_init(crtc);
-
-       intel_crtc_crc_init(crtc);
-
-       drm_WARN_ON(&dev_priv->drm, drm_crtc_index(&crtc->base) != crtc->pipe);
-
-       return 0;
-
-fail:
-       intel_crtc_free(crtc);
-
-       return ret;
-}
 
 int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
                                      struct drm_file *file)