[Intel-gfx] [PATCH 17/21] drm/i915: constify the cdclk vtable
Jani Nikula
jani.nikula at linux.intel.com
Wed Sep 8 11:56:33 UTC 2021
On Wed, 08 Sep 2021, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> This is a bit of a twisty one since each platform is slightly
> different, so might take some more review care.
Yes, it was a PITA to review. But the end result is good.
Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_cdclk.c | 306 ++++++++++++------
> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> .../drm/i915/display/intel_display_power.c | 2 +-
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> 4 files changed, 211 insertions(+), 101 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index c12b4e6bf5f5..9ce053bea022 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -1466,7 +1466,7 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,
> * at least what the CDCLK frequency requires.
> */
> cdclk_config->voltage_level =
> - dev_priv->cdclk_funcs.calc_voltage_level(cdclk_config->cdclk);
> + dev_priv->cdclk_funcs->calc_voltage_level(cdclk_config->cdclk);
> }
>
> static void bxt_de_pll_disable(struct drm_i915_private *dev_priv)
> @@ -1777,7 +1777,7 @@ static void bxt_cdclk_init_hw(struct drm_i915_private *dev_priv)
> cdclk_config.cdclk = bxt_calc_cdclk(dev_priv, 0);
> cdclk_config.vco = bxt_calc_cdclk_pll_vco(dev_priv, cdclk_config.cdclk);
> cdclk_config.voltage_level =
> - dev_priv->cdclk_funcs.calc_voltage_level(cdclk_config.cdclk);
> + dev_priv->cdclk_funcs->calc_voltage_level(cdclk_config.cdclk);
>
> bxt_set_cdclk(dev_priv, &cdclk_config, INVALID_PIPE);
> }
> @@ -1789,7 +1789,7 @@ static void bxt_cdclk_uninit_hw(struct drm_i915_private *dev_priv)
> cdclk_config.cdclk = cdclk_config.bypass;
> cdclk_config.vco = 0;
> cdclk_config.voltage_level =
> - dev_priv->cdclk_funcs.calc_voltage_level(cdclk_config.cdclk);
> + dev_priv->cdclk_funcs->calc_voltage_level(cdclk_config.cdclk);
>
> bxt_set_cdclk(dev_priv, &cdclk_config, INVALID_PIPE);
> }
> @@ -1932,7 +1932,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->cdclk_funcs->set_cdclk))
> return;
>
> intel_dump_cdclk_config(cdclk_config, "Changing CDCLK to");
> @@ -1956,7 +1956,7 @@ static void intel_set_cdclk(struct drm_i915_private *dev_priv,
> &dev_priv->gmbus_mutex);
> }
>
> - dev_priv->cdclk_funcs.set_cdclk(dev_priv, cdclk_config, pipe);
> + dev_priv->cdclk_funcs->set_cdclk(dev_priv, cdclk_config, pipe);
>
> for_each_intel_dp(&dev_priv->drm, encoder) {
> struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> @@ -2414,7 +2414,7 @@ static int bxt_modeset_calc_cdclk(struct intel_cdclk_state *cdclk_state)
> cdclk_state->logical.cdclk = cdclk;
> cdclk_state->logical.voltage_level =
> max_t(int, min_voltage_level,
> - dev_priv->cdclk_funcs.calc_voltage_level(cdclk));
> + dev_priv->cdclk_funcs->calc_voltage_level(cdclk));
>
> if (!cdclk_state->active_pipes) {
> cdclk = bxt_calc_cdclk(dev_priv, cdclk_state->force_min_cdclk);
> @@ -2423,7 +2423,7 @@ static int bxt_modeset_calc_cdclk(struct intel_cdclk_state *cdclk_state)
> cdclk_state->actual.vco = vco;
> cdclk_state->actual.cdclk = cdclk;
> cdclk_state->actual.voltage_level =
> - dev_priv->cdclk_funcs.calc_voltage_level(cdclk);
> + dev_priv->cdclk_funcs->calc_voltage_level(cdclk);
> } else {
> cdclk_state->actual = cdclk_state->logical;
> }
> @@ -2515,7 +2515,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
> new_cdclk_state->active_pipes =
> intel_calc_active_pipes(state, old_cdclk_state->active_pipes);
>
> - ret = dev_priv->cdclk_funcs.modeset_calc_cdclk(new_cdclk_state);
> + ret = dev_priv->cdclk_funcs->modeset_calc_cdclk(new_cdclk_state);
> if (ret)
> return ret;
>
> @@ -2695,7 +2695,7 @@ void intel_update_max_cdclk(struct drm_i915_private *dev_priv)
> */
> void intel_update_cdclk(struct drm_i915_private *dev_priv)
> {
> - dev_priv->cdclk_funcs.get_cdclk(dev_priv, &dev_priv->cdclk.hw);
> + dev_priv->cdclk_funcs->get_cdclk(dev_priv, &dev_priv->cdclk.hw);
>
> /*
> * 9:0 CMBUS [sic] CDCLK frequency (cdfreq):
> @@ -2845,6 +2845,157 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)
> return freq;
> }
>
> +static struct drm_i915_display_cdclk_funcs tgl_cdclk_funcs = {
> + .get_cdclk = bxt_get_cdclk,
> + .set_cdclk = bxt_set_cdclk,
> + .bw_calc_min_cdclk = skl_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
> + .calc_voltage_level = tgl_calc_voltage_level,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs ehl_cdclk_funcs = {
> + .get_cdclk = bxt_get_cdclk,
> + .set_cdclk = bxt_set_cdclk,
> + .bw_calc_min_cdclk = skl_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
> + .calc_voltage_level = ehl_calc_voltage_level,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs icl_cdclk_funcs = {
> + .get_cdclk = bxt_get_cdclk,
> + .set_cdclk = bxt_set_cdclk,
> + .bw_calc_min_cdclk = skl_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
> + .calc_voltage_level = icl_calc_voltage_level,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs bxt_cdclk_funcs = {
> + .get_cdclk = bxt_get_cdclk,
> + .set_cdclk = bxt_set_cdclk,
> + .bw_calc_min_cdclk = skl_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = bxt_modeset_calc_cdclk,
> + .calc_voltage_level = bxt_calc_voltage_level,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs skl_cdclk_funcs = {
> + .get_cdclk = skl_get_cdclk,
> + .set_cdclk = skl_set_cdclk,
> + .bw_calc_min_cdclk = skl_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = skl_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs bdw_cdclk_funcs = {
> + .get_cdclk = bdw_get_cdclk,
> + .set_cdclk = bdw_set_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = bdw_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs chv_cdclk_funcs = {
> + .get_cdclk = vlv_get_cdclk,
> + .set_cdclk = chv_set_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs vlv_cdclk_funcs = {
> + .get_cdclk = vlv_get_cdclk,
> + .set_cdclk = vlv_set_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = vlv_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs hsw_cdclk_funcs = {
> + .get_cdclk = hsw_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +/* SNB, IVB, 965G, 945G */
> +static struct drm_i915_display_cdclk_funcs fixed_400mhz_cdclk_funcs = {
> + .get_cdclk = fixed_400mhz_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs ilk_cdclk_funcs = {
> + .get_cdclk = fixed_450mhz_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs gm45_cdclk_funcs = {
> + .get_cdclk = gm45_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +/* G45 uses G33 */
> +
> +static struct drm_i915_display_cdclk_funcs i965gm_cdclk_funcs = {
> + .get_cdclk = i965gm_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +/* i965G uses fixed 400 */
> +
> +static struct drm_i915_display_cdclk_funcs pnv_cdclk_funcs = {
> + .get_cdclk = pnv_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs g33_cdclk_funcs = {
> + .get_cdclk = g33_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs i945gm_cdclk_funcs = {
> + .get_cdclk = i945gm_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +/* i945G uses fixed 400 */
> +
> +static struct drm_i915_display_cdclk_funcs i915gm_cdclk_funcs = {
> + .get_cdclk = i915gm_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs i915g_cdclk_funcs = {
> + .get_cdclk = fixed_333mhz_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs i865g_cdclk_funcs = {
> + .get_cdclk = fixed_266mhz_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs i85x_cdclk_funcs = {
> + .get_cdclk = i85x_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs i845g_cdclk_funcs = {
> + .get_cdclk = fixed_200mhz_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> +static struct drm_i915_display_cdclk_funcs i830_cdclk_funcs = {
> + .get_cdclk = fixed_133mhz_get_cdclk,
> + .bw_calc_min_cdclk = intel_bw_calc_min_cdclk,
> + .modeset_calc_cdclk = fixed_modeset_calc_cdclk,
> +};
> +
> /**
> * intel_init_cdclk_hooks - Initialize CDCLK related modesetting hooks
> * @dev_priv: i915 device
> @@ -2852,119 +3003,78 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)
> void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
> {
> if (IS_DG2(dev_priv)) {
> - dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> - dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
> + dev_priv->cdclk_funcs = &tgl_cdclk_funcs;
> dev_priv->cdclk.table = dg2_cdclk_table;
> } else if (IS_ALDERLAKE_P(dev_priv)) {
> - dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> - dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
> + dev_priv->cdclk_funcs = &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.set_cdclk = bxt_set_cdclk;
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> - dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
> + dev_priv->cdclk_funcs = &tgl_cdclk_funcs;
> dev_priv->cdclk.table = rkl_cdclk_table;
> } else if (DISPLAY_VER(dev_priv) >= 12) {
> - dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> - dev_priv->cdclk_funcs.calc_voltage_level = tgl_calc_voltage_level;
> + dev_priv->cdclk_funcs = &tgl_cdclk_funcs;
> dev_priv->cdclk.table = icl_cdclk_table;
> } else if (IS_JSL_EHL(dev_priv)) {
> - dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> - dev_priv->cdclk_funcs.calc_voltage_level = ehl_calc_voltage_level;
> + dev_priv->cdclk_funcs = &ehl_cdclk_funcs;
> dev_priv->cdclk.table = icl_cdclk_table;
> } else if (DISPLAY_VER(dev_priv) >= 11) {
> - dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> - dev_priv->cdclk_funcs.calc_voltage_level = icl_calc_voltage_level;
> + dev_priv->cdclk_funcs = &icl_cdclk_funcs;
> dev_priv->cdclk.table = icl_cdclk_table;
> } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.set_cdclk = bxt_set_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
> - dev_priv->cdclk_funcs.calc_voltage_level = bxt_calc_voltage_level;
> + dev_priv->cdclk_funcs = &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.bw_calc_min_cdclk = skl_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.set_cdclk = skl_set_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = skl_modeset_calc_cdclk;
> + dev_priv->cdclk_funcs = &skl_cdclk_funcs;
> } else if (IS_BROADWELL(dev_priv)) {
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.set_cdclk = bdw_set_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = bdw_modeset_calc_cdclk;
> + dev_priv->cdclk_funcs = &bdw_cdclk_funcs;
> + } else if (IS_HASWELL(dev_priv)) {
> + dev_priv->cdclk_funcs = &hsw_cdclk_funcs;
> } else if (IS_CHERRYVIEW(dev_priv)) {
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.set_cdclk = chv_set_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = vlv_modeset_calc_cdclk;
> + dev_priv->cdclk_funcs = &chv_cdclk_funcs;
> } else if (IS_VALLEYVIEW(dev_priv)) {
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.set_cdclk = vlv_set_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = vlv_modeset_calc_cdclk;
> - } else {
> - dev_priv->cdclk_funcs.bw_calc_min_cdclk = intel_bw_calc_min_cdclk;
> - dev_priv->cdclk_funcs.modeset_calc_cdclk = fixed_modeset_calc_cdclk;
> + dev_priv->cdclk_funcs = &vlv_cdclk_funcs;
> + } else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) {
> + dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs;
> + } else if (IS_IRONLAKE(dev_priv)) {
> + dev_priv->cdclk_funcs = &ilk_cdclk_funcs;
> + } else if (IS_GM45(dev_priv)) {
> + dev_priv->cdclk_funcs = &gm45_cdclk_funcs;
> + } else if (IS_G45(dev_priv)) {
> + dev_priv->cdclk_funcs = &g33_cdclk_funcs;
> + } else if (IS_I965GM(dev_priv)) {
> + dev_priv->cdclk_funcs = &i965gm_cdclk_funcs;
> + } else if (IS_I965G(dev_priv)) {
> + dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs;
> + } else if (IS_PINEVIEW(dev_priv)) {
> + dev_priv->cdclk_funcs = &pnv_cdclk_funcs;
> + } else if (IS_G33(dev_priv)) {
> + dev_priv->cdclk_funcs = &g33_cdclk_funcs;
> + } else if (IS_I945GM(dev_priv)) {
> + dev_priv->cdclk_funcs = &i945gm_cdclk_funcs;
> + } else if (IS_I945G(dev_priv)) {
> + dev_priv->cdclk_funcs = &fixed_400mhz_cdclk_funcs;
> + } else if (IS_I915GM(dev_priv)) {
> + dev_priv->cdclk_funcs = &i915gm_cdclk_funcs;
> + } else if (IS_I915G(dev_priv)) {
> + dev_priv->cdclk_funcs = &i915g_cdclk_funcs;
> + } else if (IS_I865G(dev_priv)) {
> + dev_priv->cdclk_funcs = &i865g_cdclk_funcs;
> + } else if (IS_I85X(dev_priv)) {
> + dev_priv->cdclk_funcs = &i85x_cdclk_funcs;
> + } else if (IS_I845G(dev_priv)) {
> + dev_priv->cdclk_funcs = &i845g_cdclk_funcs;
> + } else if (IS_I830(dev_priv)) {
> + dev_priv->cdclk_funcs = &i830_cdclk_funcs;
> }
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_BROXTON(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = bxt_get_cdclk;
> - else if (DISPLAY_VER(dev_priv) == 9)
> - dev_priv->cdclk_funcs.get_cdclk = skl_get_cdclk;
> - else if (IS_BROADWELL(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = bdw_get_cdclk;
> - else if (IS_HASWELL(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = hsw_get_cdclk;
> - else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = vlv_get_cdclk;
> - else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_400mhz_get_cdclk;
> - else if (IS_IRONLAKE(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_450mhz_get_cdclk;
> - else if (IS_GM45(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = gm45_get_cdclk;
> - else if (IS_G45(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = g33_get_cdclk;
> - else if (IS_I965GM(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = i965gm_get_cdclk;
> - else if (IS_I965G(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_400mhz_get_cdclk;
> - else if (IS_PINEVIEW(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = pnv_get_cdclk;
> - else if (IS_G33(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = g33_get_cdclk;
> - else if (IS_I945GM(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = i945gm_get_cdclk;
> - else if (IS_I945G(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_400mhz_get_cdclk;
> - else if (IS_I915GM(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = i915gm_get_cdclk;
> - else if (IS_I915G(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_333mhz_get_cdclk;
> - else if (IS_I865G(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_266mhz_get_cdclk;
> - else if (IS_I85X(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = i85x_get_cdclk;
> - else if (IS_I845G(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_200mhz_get_cdclk;
> - else if (IS_I830(dev_priv))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_133mhz_get_cdclk;
> -
> - if (drm_WARN(&dev_priv->drm, !dev_priv->cdclk_funcs.get_cdclk,
> - "Unknown platform. Assuming 133 MHz CDCLK\n"))
> - dev_priv->cdclk_funcs.get_cdclk = fixed_133mhz_get_cdclk;
> + if (drm_WARN(&dev_priv->drm, !dev_priv->cdclk_funcs,
> + "Unknown platform. Assuming i830\n"))
> + dev_priv->cdclk_funcs = &i830_cdclk_funcs;
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index d8a576d1435e..09c9dc741026 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -9120,7 +9120,7 @@ static int intel_atomic_check_cdclk(struct intel_atomic_state *state,
> old_cdclk_state->force_min_cdclk != new_cdclk_state->force_min_cdclk)
> *need_cdclk_calc = true;
>
> - ret = dev_priv->cdclk_funcs.bw_calc_min_cdclk(state);
> + ret = dev_priv->cdclk_funcs->bw_calc_min_cdclk(state);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 2cf420c06ed6..b6c233039a54 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -1195,7 +1195,7 @@ static void gen9_disable_dc_states(struct drm_i915_private *dev_priv)
> if (!HAS_DISPLAY(dev_priv))
> return;
>
> - dev_priv->cdclk_funcs.get_cdclk(dev_priv, &cdclk_config);
> + dev_priv->cdclk_funcs->get_cdclk(dev_priv, &cdclk_config);
> /* Can't read out voltage_level so can't use intel_cdclk_changed() */
> drm_WARN_ON(&dev_priv->drm,
> intel_cdclk_needs_modeset(&dev_priv->cdclk.hw,
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index a9563730aad5..085012727549 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1021,7 +1021,7 @@ struct drm_i915_private {
> const struct drm_i915_display_audio_funcs *audio_funcs;
>
> /* Display CDCLK functions */
> - struct drm_i915_display_cdclk_funcs cdclk_funcs;
> + const struct drm_i915_display_cdclk_funcs *cdclk_funcs;
>
> /* PCH chipset type */
> enum intel_pch pch_type;
--
Jani Nikula, Intel Open Source Graphics Center
More information about the Intel-gfx
mailing list