On Thu, Nov 28, 2024 at 05:38:22PM +0200, Jani Nikula wrote: > Going forward, struct intel_display is the main device data structure > for display. Convert intel_display_power.c internally first, leaving > external interfaces for follow-up. > > v2: Rebase, checkpatch fixes > > Cc: Imre Deak <imre.deak@xxxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > .../drm/i915/display/intel_display_power.c | 806 +++++++++--------- > 1 file changed, 414 insertions(+), 392 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c > index ade7192c0461..4043d6971c3e 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_power.c > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c > > [...] > > -static void hsw_disable_pc8(struct drm_i915_private *dev_priv) > +static void hsw_disable_pc8(struct intel_display *display) > { > - drm_dbg_kms(&dev_priv->drm, "Disabling package C8+\n"); > + struct drm_i915_private *dev_priv = to_i915(display->drm); > + > + drm_dbg_kms(display->drm, "Disabling package C8+\n"); > > - hsw_restore_lcpll(dev_priv); > + hsw_restore_lcpll(display); > intel_init_pch_refclk(dev_priv); > > /* Many display registers don't survive PC8+ */ > +#ifdef I915 /* FIXME */ > intel_clock_gating_init(dev_priv); > +#endif So before the call of hsw_disable_pc8() was optimized out, but now it's not. For now ok, but imo this could've been in a separate patch. > } >