On Thu, 2020-02-06 at 16:14 -0800, Matt Roper wrote: > A recent bspec update added an extra voltage level that we didn't > have > on ICL and new criteria for selecting the level.
Reviewed-by: José Roberto de Souza <[email protected]> > > Bspec: 49208 > Cc: José Roberto de Souza <[email protected]> > Cc: Anusha Srivatsa <[email protected]> > Signed-off-by: Matt Roper <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_cdclk.c | 19 ++++++++++++++++++- > drivers/gpu/drm/i915/display/intel_ddi.c | 4 +++- > 2 files changed, 21 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c > b/drivers/gpu/drm/i915/display/intel_cdclk.c > index 7154a2288310..55b5dd169c51 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c > @@ -1295,6 +1295,18 @@ static u8 ehl_calc_voltage_level(int cdclk) > return 0; > } > > +static u8 tgl_calc_voltage_level(int cdclk) > +{ > + if (cdclk > 556800) > + return 3; > + else if (cdclk > 326400) > + return 2; > + else if (cdclk > 312000) > + return 1; > + else > + return 0; > +} > + > static void cnl_readout_refclk(struct drm_i915_private *dev_priv, > struct intel_cdclk_config *cdclk_config) > { > @@ -2711,7 +2723,12 @@ void intel_update_rawclk(struct > drm_i915_private *dev_priv) > */ > void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv) > { > - if (IS_ELKHARTLAKE(dev_priv)) { > + if (INTEL_GEN(dev_priv) >= 12) { > + dev_priv->display.set_cdclk = bxt_set_cdclk; > + dev_priv->display.modeset_calc_cdclk = > bxt_modeset_calc_cdclk; > + dev_priv->display.calc_voltage_level = > tgl_calc_voltage_level; > + dev_priv->cdclk.table = icl_cdclk_table; > + } else if (IS_ELKHARTLAKE(dev_priv)) { > dev_priv->display.set_cdclk = bxt_set_cdclk; > dev_priv->display.modeset_calc_cdclk = > bxt_modeset_calc_cdclk; > dev_priv->display.calc_voltage_level = > ehl_calc_voltage_level; > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index ff638fc6e3f5..08a66b8a25cf 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -4206,7 +4206,9 @@ static bool intel_ddi_is_audio_enabled(struct > drm_i915_private *dev_priv, > void intel_ddi_compute_min_voltage_level(struct drm_i915_private > *dev_priv, > struct intel_crtc_state > *crtc_state) > { > - if (IS_ELKHARTLAKE(dev_priv) && crtc_state->port_clock > > 594000) > + if (INTEL_GEN(dev_priv) >= 12 && crtc_state->port_clock > > 594000) > + crtc_state->min_voltage_level = 2; > + else if (IS_ELKHARTLAKE(dev_priv) && crtc_state->port_clock > > 594000) > crtc_state->min_voltage_level = 3; > else if (INTEL_GEN(dev_priv) >= 11 && crtc_state->port_clock > > 594000) > crtc_state->min_voltage_level = 1; _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
