On Wed, 09 Feb 2022, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > On Thu, Feb 03, 2022 at 04:02:33PM +0200, Jani Nikula wrote: >> The struct is only needed in intel_pm.c, move it there. >> >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > I find these single vfunc structs a bit ridiculous, but since > we have them might as well hide them. > > For the series is > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Thanks, pushed the lot. BR, Jani. > >> --- >> drivers/gpu/drm/i915/i915_drv.h | 6 +----- >> drivers/gpu/drm/i915/intel_pm.c | 4 ++++ >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 078fc50e7eb9..4ac0fcb9a4ca 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -107,6 +107,7 @@ >> #include "i915_vma.h" >> >> struct dpll; >> +struct drm_i915_clock_gating_funcs; >> struct drm_i915_gem_object; >> struct drm_i915_private; >> struct intel_atomic_state; >> @@ -302,11 +303,6 @@ struct sdvo_device_mapping { >> u8 ddc_pin; >> }; >> >> -/* functions used internal in intel_pm.c */ >> -struct drm_i915_clock_gating_funcs { >> - void (*init_clock_gating)(struct drm_i915_private *dev_priv); >> -}; >> - >> /* functions used for watermark calcs for display. */ >> struct drm_i915_wm_disp_funcs { >> /* update_wm is for legacy wm management */ >> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c >> index 859be750fb22..2e84d45f9bf0 100644 >> --- a/drivers/gpu/drm/i915/intel_pm.c >> +++ b/drivers/gpu/drm/i915/intel_pm.c >> @@ -55,6 +55,10 @@ >> #include "vlv_sideband.h" >> #include "../../../platform/x86/intel_ips.h" >> >> +struct drm_i915_clock_gating_funcs { >> + void (*init_clock_gating)(struct drm_i915_private *i915); >> +}; >> + >> /* Stores plane specific WM parameters */ >> struct skl_wm_params { >> bool x_tiled, y_tiled; >> -- >> 2.30.2 -- Jani Nikula, Intel Open Source Graphics Center