On Wed, 10 Jun 2026, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > Overwrite cdclk.hw.voltage_level from intel_update_cdclk() at the > end on bxt_set_cdclk() also on bxt/glk. While this isn't actually > necessary due to bxt/glk not having any extra DDI based voltage > level requirements, it does avoid one less silly 'if' in the code. > > On icl+ the value derived by bxt_get_cdclk() may not be correct > if the voltage level was bumped up due to DDI requirements, thus > overwriting the assumed value is crucial there. > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_cdclk.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c > b/drivers/gpu/drm/i915/display/intel_cdclk.c > index ecb6be3383ca..bbf3603f889b 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c > @@ -2308,12 +2308,11 @@ static void bxt_set_cdclk(struct intel_display > *display, > > intel_update_cdclk(display); > > - if (DISPLAY_VER(display) >= 11) > - /* > - * Can't read out the voltage level :( > - * Let's just assume everything is as expected. > - */ > - display->cdclk.hw.voltage_level = cdclk_config->voltage_level; > + /* > + * Can't read out the voltage level :( > + * Let's just assume everything is as expected. > + */ > + display->cdclk.hw.voltage_level = cdclk_config->voltage_level; > } > > static void bxt_sanitize_cdclk(struct intel_display *display) -- Jani Nikula, Intel
