drm/i915: move cdclk_funcs to display.funcs

Move display cdclk functions under drm_i915_private display sub-struct.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/77e12e21bb9682a3c1d54f8d59eecc5945ef16d0.1661346845.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 1ee61ab..4921fdd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -79,26 +79,26 @@ struct intel_cdclk_funcs {
 void intel_cdclk_get_cdclk(struct drm_i915_private *dev_priv,
                           struct intel_cdclk_config *cdclk_config)
 {
-       dev_priv->cdclk_funcs->get_cdclk(dev_priv, cdclk_config);
+       dev_priv->display.funcs.cdclk->get_cdclk(dev_priv, cdclk_config);
 }
 
 static void intel_cdclk_set_cdclk(struct drm_i915_private *dev_priv,
                                  const struct intel_cdclk_config *cdclk_config,
                                  enum pipe pipe)
 {
-       dev_priv->cdclk_funcs->set_cdclk(dev_priv, cdclk_config, pipe);
+       dev_priv->display.funcs.cdclk->set_cdclk(dev_priv, cdclk_config, pipe);
 }
 
 static int intel_cdclk_modeset_calc_cdclk(struct drm_i915_private *dev_priv,
                                          struct intel_cdclk_state *cdclk_config)
 {
-       return dev_priv->cdclk_funcs->modeset_calc_cdclk(cdclk_config);
+       return dev_priv->display.funcs.cdclk->modeset_calc_cdclk(cdclk_config);
 }
 
 static u8 intel_cdclk_calc_voltage_level(struct drm_i915_private *dev_priv,
                                         int cdclk)
 {
-       return dev_priv->cdclk_funcs->calc_voltage_level(cdclk);
+       return dev_priv->display.funcs.cdclk->calc_voltage_level(cdclk);
 }
 
 static void fixed_133mhz_get_cdclk(struct drm_i915_private *dev_priv,
@@ -2080,7 +2080,7 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,
        if (!intel_cdclk_changed(&dev_priv->cdclk.hw, cdclk_config))
                return;
 
-       if (drm_WARN_ON_ONCE(&dev_priv->drm, !dev_priv->cdclk_funcs->set_cdclk))
+       if (drm_WARN_ON_ONCE(&dev_priv->drm, !dev_priv->display.funcs.cdclk->set_cdclk))
                return;
 
        intel_cdclk_dump_config(dev_priv, cdclk_config, "Changing CDCLK to");
@@ -3194,78 +3194,78 @@ static const struct intel_cdclk_funcs i830_cdclk_funcs = {
 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 {
        if (IS_DG2(dev_priv)) {
-               dev_priv->cdclk_funcs = &tgl_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
                dev_priv->cdclk.table = dg2_cdclk_table;
        } else if (IS_ALDERLAKE_P(dev_priv)) {
-               dev_priv->cdclk_funcs = &tgl_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
                /* Wa_22011320316:adl-p[a0] */
                if (IS_ADLP_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0))
                        dev_priv->cdclk.table = adlp_a_step_cdclk_table;
                else
                        dev_priv->cdclk.table = adlp_cdclk_table;
        } else if (IS_ROCKETLAKE(dev_priv)) {
-               dev_priv->cdclk_funcs = &tgl_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
                dev_priv->cdclk.table = rkl_cdclk_table;
        } else if (DISPLAY_VER(dev_priv) >= 12) {
-               dev_priv->cdclk_funcs = &tgl_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
                dev_priv->cdclk.table = icl_cdclk_table;
        } else if (IS_JSL_EHL(dev_priv)) {
-               dev_priv->cdclk_funcs = &ehl_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &ehl_cdclk_funcs;
                dev_priv->cdclk.table = icl_cdclk_table;
        } else if (DISPLAY_VER(dev_priv) >= 11) {
-               dev_priv->cdclk_funcs = &icl_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &icl_cdclk_funcs;
                dev_priv->cdclk.table = icl_cdclk_table;
        } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
-               dev_priv->cdclk_funcs = &bxt_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &bxt_cdclk_funcs;
                if (IS_GEMINILAKE(dev_priv))
                        dev_priv->cdclk.table = glk_cdclk_table;
                else
                        dev_priv->cdclk.table = bxt_cdclk_table;
        } else if (DISPLAY_VER(dev_priv) == 9) {
-               dev_priv->cdclk_funcs = &skl_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &skl_cdclk_funcs;
        } else if (IS_BROADWELL(dev_priv)) {
-               dev_priv->cdclk_funcs = &bdw_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &bdw_cdclk_funcs;
        } else if (IS_HASWELL(dev_priv)) {
-               dev_priv->cdclk_funcs = &hsw_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &hsw_cdclk_funcs;
        } else if (IS_CHERRYVIEW(dev_priv)) {
-               dev_priv->cdclk_funcs = &chv_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &chv_cdclk_funcs;
        } else if (IS_VALLEYVIEW(dev_priv)) {
-               dev_priv->cdclk_funcs = &vlv_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &vlv_cdclk_funcs;
        } else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) {
-               dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
        } else if (IS_IRONLAKE(dev_priv)) {
-               dev_priv->cdclk_funcs = &ilk_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &ilk_cdclk_funcs;
        } else if (IS_GM45(dev_priv)) {
-               dev_priv->cdclk_funcs = &gm45_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &gm45_cdclk_funcs;
        } else if (IS_G45(dev_priv)) {
-               dev_priv->cdclk_funcs = &g33_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
        } else if (IS_I965GM(dev_priv)) {
-               dev_priv->cdclk_funcs = &i965gm_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i965gm_cdclk_funcs;
        } else if (IS_I965G(dev_priv)) {
-               dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
        } else if (IS_PINEVIEW(dev_priv)) {
-               dev_priv->cdclk_funcs = &pnv_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &pnv_cdclk_funcs;
        } else if (IS_G33(dev_priv)) {
-               dev_priv->cdclk_funcs = &g33_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &g33_cdclk_funcs;
        } else if (IS_I945GM(dev_priv)) {
-               dev_priv->cdclk_funcs = &i945gm_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i945gm_cdclk_funcs;
        } else if (IS_I945G(dev_priv)) {
-               dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &fixed_400mhz_cdclk_funcs;
        } else if (IS_I915GM(dev_priv)) {
-               dev_priv->cdclk_funcs = &i915gm_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i915gm_cdclk_funcs;
        } else if (IS_I915G(dev_priv)) {
-               dev_priv->cdclk_funcs = &i915g_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i915g_cdclk_funcs;
        } else if (IS_I865G(dev_priv)) {
-               dev_priv->cdclk_funcs = &i865g_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i865g_cdclk_funcs;
        } else if (IS_I85X(dev_priv)) {
-               dev_priv->cdclk_funcs = &i85x_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i85x_cdclk_funcs;
        } else if (IS_I845G(dev_priv)) {
-               dev_priv->cdclk_funcs = &i845g_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i845g_cdclk_funcs;
        } else if (IS_I830(dev_priv)) {
-               dev_priv->cdclk_funcs = &i830_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
        }
 
-       if (drm_WARN(&dev_priv->drm, !dev_priv->cdclk_funcs,
+       if (drm_WARN(&dev_priv->drm, !dev_priv->display.funcs.cdclk,
                     "Unknown platform. Assuming i830\n"))
-               dev_priv->cdclk_funcs = &i830_cdclk_funcs;
+               dev_priv->display.funcs.cdclk = &i830_cdclk_funcs;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index c326d53..c185ab0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 
 struct intel_atomic_state;
+struct intel_cdclk_funcs;
 struct intel_crtc;
 struct intel_crtc_state;
 struct intel_initial_plane_config;
@@ -34,6 +35,9 @@ struct intel_display {
        struct {
                /* Top level crtc-ish functions */
                const struct intel_display_funcs *display;
+
+               /* Display CDCLK functions */
+               const struct intel_cdclk_funcs *cdclk;
        } funcs;
 };
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4d10e09..60df759 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -84,7 +84,6 @@ struct drm_i915_private;
 struct intel_atomic_state;
 struct intel_audio_funcs;
 struct intel_cdclk_config;
-struct intel_cdclk_funcs;
 struct intel_cdclk_state;
 struct intel_cdclk_vals;
 struct intel_color_funcs;
@@ -523,9 +522,6 @@ struct drm_i915_private {
        /* Display internal color functions */
        const struct intel_color_funcs *color_funcs;
 
-       /* Display CDCLK functions */
-       const struct intel_cdclk_funcs *cdclk_funcs;
-
        /* PCH chipset type */
        enum intel_pch pch_type;
        unsigned short pch_id;