| Message ID | 20240617170356.4000251-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/i915: Move encoder suspend/shutdown helpers to intel_encoder.c | expand |
On Mon, Jun 17, 2024 at 08:03:54PM +0300, Imre Deak wrote: > Move the encoder suspend/shutdown helpers to intel_encoder.c, this being > the logical place for encoder functions. > > This also allows sharing the above helpers with the xe driver, done in a > follow-up patch. > > While at it rename the functions using the usual intel_encoder prefix > and in the functions rename the dev_priv parameter to i915. > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/display/intel_encoder.c | 44 +++++++++++++++++ > drivers/gpu/drm/i915/display/intel_encoder.h | 5 ++ > drivers/gpu/drm/i915/i915_driver.c | 51 ++------------------ > 3 files changed, 53 insertions(+), 47 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.c b/drivers/gpu/drm/i915/display/intel_encoder.c > index dee55f56960fc..8a1dccb893a37 100644 > --- a/drivers/gpu/drm/i915/display/intel_encoder.c > +++ b/drivers/gpu/drm/i915/display/intel_encoder.c > @@ -37,3 +37,47 @@ void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int dela > mod_delayed_work(i915->unordered_wq, > &encoder->link_check_work, msecs_to_jiffies(delay_ms)); > } > + > +void intel_encoder_suspend_all(struct drm_i915_private *i915) > +{ > + struct intel_encoder *encoder; > + > + if (!HAS_DISPLAY(i915)) > + return; > + > + /* > + * TODO: check and remove holding the modeset locks if none of > + * the encoders depends on this. > + */ > + drm_modeset_lock_all(&i915->drm); > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->suspend) > + encoder->suspend(encoder); > + drm_modeset_unlock_all(&i915->drm); > + > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->suspend_complete) > + encoder->suspend_complete(encoder); > +} > + > +void intel_encoder_shutdown_all(struct drm_i915_private *i915) > +{ > + struct intel_encoder *encoder; > + > + if (!HAS_DISPLAY(i915)) > + return; > + > + /* > + * TODO: check and remove holding the modeset locks if none of > + * the encoders depends on this. > + */ > + drm_modeset_lock_all(&i915->drm); > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->shutdown) > + encoder->shutdown(encoder); > + drm_modeset_unlock_all(&i915->drm); > + > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->shutdown_complete) > + encoder->shutdown_complete(encoder); > +} > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.h b/drivers/gpu/drm/i915/display/intel_encoder.h > index 2cda054e2b152..e6cd74576f78e 100644 > --- a/drivers/gpu/drm/i915/display/intel_encoder.h > +++ b/drivers/gpu/drm/i915/display/intel_encoder.h > @@ -6,6 +6,8 @@ > #ifndef __INTEL_ENCODER_H__ > #define __INTEL_ENCODER_H__ > > +struct drm_i915_private; > + > struct intel_encoder; > > void intel_encoder_link_check_init(struct intel_encoder *encoder, > @@ -13,4 +15,7 @@ void intel_encoder_link_check_init(struct intel_encoder *encoder, > void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms); > void intel_encoder_link_check_flush_work(struct intel_encoder *encoder); > > +void intel_encoder_suspend_all(struct drm_i915_private *i915); > +void intel_encoder_shutdown_all(struct drm_i915_private *i915); > + > #endif /* __INTEL_ENCODER_H__ */ > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index 161b21eff6943..e9e38ed246f66 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -53,6 +53,7 @@ > #include "display/intel_dmc.h" > #include "display/intel_dp.h" > #include "display/intel_dpt.h" > +#include "display/intel_encoder.h" > #include "display/intel_fbdev.h" > #include "display/intel_hotplug.h" > #include "display/intel_overlay.h" > @@ -933,50 +934,6 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) > i915_gem_flush_free_objects(to_i915(dev)); > } > > -static void intel_suspend_encoders(struct drm_i915_private *dev_priv) > -{ > - struct intel_encoder *encoder; > - > - if (!HAS_DISPLAY(dev_priv)) > - return; > - > - /* > - * TODO: check and remove holding the modeset locks if none of > - * the encoders depends on this. > - */ > - drm_modeset_lock_all(&dev_priv->drm); > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->suspend) > - encoder->suspend(encoder); > - drm_modeset_unlock_all(&dev_priv->drm); > - > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->suspend_complete) > - encoder->suspend_complete(encoder); > -} > - > -static void intel_shutdown_encoders(struct drm_i915_private *dev_priv) > -{ > - struct intel_encoder *encoder; > - > - if (!HAS_DISPLAY(dev_priv)) > - return; > - > - /* > - * TODO: check and remove holding the modeset locks if none of > - * the encoders depends on this. > - */ > - drm_modeset_lock_all(&dev_priv->drm); > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->shutdown) > - encoder->shutdown(encoder); > - drm_modeset_unlock_all(&dev_priv->drm); > - > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->shutdown_complete) > - encoder->shutdown_complete(encoder); > -} > - > void i915_driver_shutdown(struct drm_i915_private *i915) > { > disable_rpm_wakeref_asserts(&i915->runtime_pm); > @@ -999,8 +956,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) > if (HAS_DISPLAY(i915)) > intel_display_driver_suspend_access(i915); > > - intel_suspend_encoders(i915); > - intel_shutdown_encoders(i915); > + intel_encoder_suspend_all(i915); > + intel_encoder_shutdown_all(i915); > > intel_dmc_suspend(i915); > > @@ -1083,7 +1040,7 @@ static int i915_drm_suspend(struct drm_device *dev) > if (HAS_DISPLAY(dev_priv)) > intel_display_driver_suspend_access(dev_priv); > > - intel_suspend_encoders(dev_priv); > + intel_encoder_suspend_all(dev_priv); > > /* Must be called before GGTT is suspended. */ > intel_dpt_suspend(dev_priv); > -- > 2.43.3 >
On Mon, 17 Jun 2024, Imre Deak <imre.deak@intel.com> wrote: > Move the encoder suspend/shutdown helpers to intel_encoder.c, this being > the logical place for encoder functions. > > This also allows sharing the above helpers with the xe driver, done in a > follow-up patch. > > While at it rename the functions using the usual intel_encoder prefix > and in the functions rename the dev_priv parameter to i915. This is good forward progress, but really i915 should also follow the xe pattern of only calling a handful of display functions from top level, instead of direct calls from i915_driver.c to a lot of places. One nitpick inline that can be fixed while applying, otherwise Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/display/intel_encoder.c | 44 +++++++++++++++++ > drivers/gpu/drm/i915/display/intel_encoder.h | 5 ++ > drivers/gpu/drm/i915/i915_driver.c | 51 ++------------------ > 3 files changed, 53 insertions(+), 47 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.c b/drivers/gpu/drm/i915/display/intel_encoder.c > index dee55f56960fc..8a1dccb893a37 100644 > --- a/drivers/gpu/drm/i915/display/intel_encoder.c > +++ b/drivers/gpu/drm/i915/display/intel_encoder.c > @@ -37,3 +37,47 @@ void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int dela > mod_delayed_work(i915->unordered_wq, > &encoder->link_check_work, msecs_to_jiffies(delay_ms)); > } > + > +void intel_encoder_suspend_all(struct drm_i915_private *i915) > +{ > + struct intel_encoder *encoder; > + > + if (!HAS_DISPLAY(i915)) > + return; > + > + /* > + * TODO: check and remove holding the modeset locks if none of > + * the encoders depends on this. > + */ > + drm_modeset_lock_all(&i915->drm); > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->suspend) > + encoder->suspend(encoder); > + drm_modeset_unlock_all(&i915->drm); > + > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->suspend_complete) > + encoder->suspend_complete(encoder); > +} > + > +void intel_encoder_shutdown_all(struct drm_i915_private *i915) > +{ > + struct intel_encoder *encoder; > + > + if (!HAS_DISPLAY(i915)) > + return; > + > + /* > + * TODO: check and remove holding the modeset locks if none of > + * the encoders depends on this. > + */ > + drm_modeset_lock_all(&i915->drm); > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->shutdown) > + encoder->shutdown(encoder); > + drm_modeset_unlock_all(&i915->drm); > + > + for_each_intel_encoder(&i915->drm, encoder) > + if (encoder->shutdown_complete) > + encoder->shutdown_complete(encoder); > +} > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.h b/drivers/gpu/drm/i915/display/intel_encoder.h > index 2cda054e2b152..e6cd74576f78e 100644 > --- a/drivers/gpu/drm/i915/display/intel_encoder.h > +++ b/drivers/gpu/drm/i915/display/intel_encoder.h > @@ -6,6 +6,8 @@ > #ifndef __INTEL_ENCODER_H__ > #define __INTEL_ENCODER_H__ > > +struct drm_i915_private; > + Superfluous newline. > struct intel_encoder; > > void intel_encoder_link_check_init(struct intel_encoder *encoder, > @@ -13,4 +15,7 @@ void intel_encoder_link_check_init(struct intel_encoder *encoder, > void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms); > void intel_encoder_link_check_flush_work(struct intel_encoder *encoder); > > +void intel_encoder_suspend_all(struct drm_i915_private *i915); > +void intel_encoder_shutdown_all(struct drm_i915_private *i915); > + > #endif /* __INTEL_ENCODER_H__ */ > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index 161b21eff6943..e9e38ed246f66 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -53,6 +53,7 @@ > #include "display/intel_dmc.h" > #include "display/intel_dp.h" > #include "display/intel_dpt.h" > +#include "display/intel_encoder.h" > #include "display/intel_fbdev.h" > #include "display/intel_hotplug.h" > #include "display/intel_overlay.h" > @@ -933,50 +934,6 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) > i915_gem_flush_free_objects(to_i915(dev)); > } > > -static void intel_suspend_encoders(struct drm_i915_private *dev_priv) > -{ > - struct intel_encoder *encoder; > - > - if (!HAS_DISPLAY(dev_priv)) > - return; > - > - /* > - * TODO: check and remove holding the modeset locks if none of > - * the encoders depends on this. > - */ > - drm_modeset_lock_all(&dev_priv->drm); > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->suspend) > - encoder->suspend(encoder); > - drm_modeset_unlock_all(&dev_priv->drm); > - > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->suspend_complete) > - encoder->suspend_complete(encoder); > -} > - > -static void intel_shutdown_encoders(struct drm_i915_private *dev_priv) > -{ > - struct intel_encoder *encoder; > - > - if (!HAS_DISPLAY(dev_priv)) > - return; > - > - /* > - * TODO: check and remove holding the modeset locks if none of > - * the encoders depends on this. > - */ > - drm_modeset_lock_all(&dev_priv->drm); > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->shutdown) > - encoder->shutdown(encoder); > - drm_modeset_unlock_all(&dev_priv->drm); > - > - for_each_intel_encoder(&dev_priv->drm, encoder) > - if (encoder->shutdown_complete) > - encoder->shutdown_complete(encoder); > -} > - > void i915_driver_shutdown(struct drm_i915_private *i915) > { > disable_rpm_wakeref_asserts(&i915->runtime_pm); > @@ -999,8 +956,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) > if (HAS_DISPLAY(i915)) > intel_display_driver_suspend_access(i915); > > - intel_suspend_encoders(i915); > - intel_shutdown_encoders(i915); > + intel_encoder_suspend_all(i915); > + intel_encoder_shutdown_all(i915); > > intel_dmc_suspend(i915); > > @@ -1083,7 +1040,7 @@ static int i915_drm_suspend(struct drm_device *dev) > if (HAS_DISPLAY(dev_priv)) > intel_display_driver_suspend_access(dev_priv); > > - intel_suspend_encoders(dev_priv); > + intel_encoder_suspend_all(dev_priv); > > /* Must be called before GGTT is suspended. */ > intel_dpt_suspend(dev_priv);
On Tue, Jun 18, 2024 at 11:01:18AM +0300, Jani Nikula wrote: > On Mon, 17 Jun 2024, Imre Deak <imre.deak@intel.com> wrote: > > Move the encoder suspend/shutdown helpers to intel_encoder.c, this being > > the logical place for encoder functions. > > > > This also allows sharing the above helpers with the xe driver, done in a > > follow-up patch. > > > > While at it rename the functions using the usual intel_encoder prefix > > and in the functions rename the dev_priv parameter to i915. > > This is good forward progress, but really i915 should also follow the xe > pattern of only calling a handful of display functions from top level, > instead of direct calls from i915_driver.c to a lot of places. Yes, agreed on moving the display related calls to intel_display_driver.c / intel_display_driver_suspend(). It needs more thought and could be done as a follow up imo. > One nitpick inline that can be fixed while applying, otherwise > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Thanks. > > Signed-off-by: Imre Deak <imre.deak@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_encoder.c | 44 +++++++++++++++++ > > drivers/gpu/drm/i915/display/intel_encoder.h | 5 ++ > > drivers/gpu/drm/i915/i915_driver.c | 51 ++------------------ > > 3 files changed, 53 insertions(+), 47 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.c b/drivers/gpu/drm/i915/display/intel_encoder.c > > index dee55f56960fc..8a1dccb893a37 100644 > > --- a/drivers/gpu/drm/i915/display/intel_encoder.c > > +++ b/drivers/gpu/drm/i915/display/intel_encoder.c > > @@ -37,3 +37,47 @@ void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int dela > > mod_delayed_work(i915->unordered_wq, > > &encoder->link_check_work, msecs_to_jiffies(delay_ms)); > > } > > + > > +void intel_encoder_suspend_all(struct drm_i915_private *i915) > > +{ > > + struct intel_encoder *encoder; > > + > > + if (!HAS_DISPLAY(i915)) > > + return; > > + > > + /* > > + * TODO: check and remove holding the modeset locks if none of > > + * the encoders depends on this. > > + */ > > + drm_modeset_lock_all(&i915->drm); > > + for_each_intel_encoder(&i915->drm, encoder) > > + if (encoder->suspend) > > + encoder->suspend(encoder); > > + drm_modeset_unlock_all(&i915->drm); > > + > > + for_each_intel_encoder(&i915->drm, encoder) > > + if (encoder->suspend_complete) > > + encoder->suspend_complete(encoder); > > +} > > + > > +void intel_encoder_shutdown_all(struct drm_i915_private *i915) > > +{ > > + struct intel_encoder *encoder; > > + > > + if (!HAS_DISPLAY(i915)) > > + return; > > + > > + /* > > + * TODO: check and remove holding the modeset locks if none of > > + * the encoders depends on this. > > + */ > > + drm_modeset_lock_all(&i915->drm); > > + for_each_intel_encoder(&i915->drm, encoder) > > + if (encoder->shutdown) > > + encoder->shutdown(encoder); > > + drm_modeset_unlock_all(&i915->drm); > > + > > + for_each_intel_encoder(&i915->drm, encoder) > > + if (encoder->shutdown_complete) > > + encoder->shutdown_complete(encoder); > > +} > > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.h b/drivers/gpu/drm/i915/display/intel_encoder.h > > index 2cda054e2b152..e6cd74576f78e 100644 > > --- a/drivers/gpu/drm/i915/display/intel_encoder.h > > +++ b/drivers/gpu/drm/i915/display/intel_encoder.h > > @@ -6,6 +6,8 @@ > > #ifndef __INTEL_ENCODER_H__ > > #define __INTEL_ENCODER_H__ > > > > +struct drm_i915_private; > > + > > Superfluous newline. > > > struct intel_encoder; > > > > void intel_encoder_link_check_init(struct intel_encoder *encoder, > > @@ -13,4 +15,7 @@ void intel_encoder_link_check_init(struct intel_encoder *encoder, > > void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms); > > void intel_encoder_link_check_flush_work(struct intel_encoder *encoder); > > > > +void intel_encoder_suspend_all(struct drm_i915_private *i915); > > +void intel_encoder_shutdown_all(struct drm_i915_private *i915); > > + > > #endif /* __INTEL_ENCODER_H__ */ > > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > > index 161b21eff6943..e9e38ed246f66 100644 > > --- a/drivers/gpu/drm/i915/i915_driver.c > > +++ b/drivers/gpu/drm/i915/i915_driver.c > > @@ -53,6 +53,7 @@ > > #include "display/intel_dmc.h" > > #include "display/intel_dp.h" > > #include "display/intel_dpt.h" > > +#include "display/intel_encoder.h" > > #include "display/intel_fbdev.h" > > #include "display/intel_hotplug.h" > > #include "display/intel_overlay.h" > > @@ -933,50 +934,6 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) > > i915_gem_flush_free_objects(to_i915(dev)); > > } > > > > -static void intel_suspend_encoders(struct drm_i915_private *dev_priv) > > -{ > > - struct intel_encoder *encoder; > > - > > - if (!HAS_DISPLAY(dev_priv)) > > - return; > > - > > - /* > > - * TODO: check and remove holding the modeset locks if none of > > - * the encoders depends on this. > > - */ > > - drm_modeset_lock_all(&dev_priv->drm); > > - for_each_intel_encoder(&dev_priv->drm, encoder) > > - if (encoder->suspend) > > - encoder->suspend(encoder); > > - drm_modeset_unlock_all(&dev_priv->drm); > > - > > - for_each_intel_encoder(&dev_priv->drm, encoder) > > - if (encoder->suspend_complete) > > - encoder->suspend_complete(encoder); > > -} > > - > > -static void intel_shutdown_encoders(struct drm_i915_private *dev_priv) > > -{ > > - struct intel_encoder *encoder; > > - > > - if (!HAS_DISPLAY(dev_priv)) > > - return; > > - > > - /* > > - * TODO: check and remove holding the modeset locks if none of > > - * the encoders depends on this. > > - */ > > - drm_modeset_lock_all(&dev_priv->drm); > > - for_each_intel_encoder(&dev_priv->drm, encoder) > > - if (encoder->shutdown) > > - encoder->shutdown(encoder); > > - drm_modeset_unlock_all(&dev_priv->drm); > > - > > - for_each_intel_encoder(&dev_priv->drm, encoder) > > - if (encoder->shutdown_complete) > > - encoder->shutdown_complete(encoder); > > -} > > - > > void i915_driver_shutdown(struct drm_i915_private *i915) > > { > > disable_rpm_wakeref_asserts(&i915->runtime_pm); > > @@ -999,8 +956,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) > > if (HAS_DISPLAY(i915)) > > intel_display_driver_suspend_access(i915); > > > > - intel_suspend_encoders(i915); > > - intel_shutdown_encoders(i915); > > + intel_encoder_suspend_all(i915); > > + intel_encoder_shutdown_all(i915); > > > > intel_dmc_suspend(i915); > > > > @@ -1083,7 +1040,7 @@ static int i915_drm_suspend(struct drm_device *dev) > > if (HAS_DISPLAY(dev_priv)) > > intel_display_driver_suspend_access(dev_priv); > > > > - intel_suspend_encoders(dev_priv); > > + intel_encoder_suspend_all(dev_priv); > > > > /* Must be called before GGTT is suspended. */ > > intel_dpt_suspend(dev_priv); > > -- > Jani Nikula, Intel
diff --git a/drivers/gpu/drm/i915/display/intel_encoder.c b/drivers/gpu/drm/i915/display/intel_encoder.c index dee55f56960fc..8a1dccb893a37 100644 --- a/drivers/gpu/drm/i915/display/intel_encoder.c +++ b/drivers/gpu/drm/i915/display/intel_encoder.c @@ -37,3 +37,47 @@ void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int dela mod_delayed_work(i915->unordered_wq, &encoder->link_check_work, msecs_to_jiffies(delay_ms)); } + +void intel_encoder_suspend_all(struct drm_i915_private *i915) +{ + struct intel_encoder *encoder; + + if (!HAS_DISPLAY(i915)) + return; + + /* + * TODO: check and remove holding the modeset locks if none of + * the encoders depends on this. + */ + drm_modeset_lock_all(&i915->drm); + for_each_intel_encoder(&i915->drm, encoder) + if (encoder->suspend) + encoder->suspend(encoder); + drm_modeset_unlock_all(&i915->drm); + + for_each_intel_encoder(&i915->drm, encoder) + if (encoder->suspend_complete) + encoder->suspend_complete(encoder); +} + +void intel_encoder_shutdown_all(struct drm_i915_private *i915) +{ + struct intel_encoder *encoder; + + if (!HAS_DISPLAY(i915)) + return; + + /* + * TODO: check and remove holding the modeset locks if none of + * the encoders depends on this. + */ + drm_modeset_lock_all(&i915->drm); + for_each_intel_encoder(&i915->drm, encoder) + if (encoder->shutdown) + encoder->shutdown(encoder); + drm_modeset_unlock_all(&i915->drm); + + for_each_intel_encoder(&i915->drm, encoder) + if (encoder->shutdown_complete) + encoder->shutdown_complete(encoder); +} diff --git a/drivers/gpu/drm/i915/display/intel_encoder.h b/drivers/gpu/drm/i915/display/intel_encoder.h index 2cda054e2b152..e6cd74576f78e 100644 --- a/drivers/gpu/drm/i915/display/intel_encoder.h +++ b/drivers/gpu/drm/i915/display/intel_encoder.h @@ -6,6 +6,8 @@ #ifndef __INTEL_ENCODER_H__ #define __INTEL_ENCODER_H__ +struct drm_i915_private; + struct intel_encoder; void intel_encoder_link_check_init(struct intel_encoder *encoder, @@ -13,4 +15,7 @@ void intel_encoder_link_check_init(struct intel_encoder *encoder, void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms); void intel_encoder_link_check_flush_work(struct intel_encoder *encoder); +void intel_encoder_suspend_all(struct drm_i915_private *i915); +void intel_encoder_shutdown_all(struct drm_i915_private *i915); + #endif /* __INTEL_ENCODER_H__ */ diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 161b21eff6943..e9e38ed246f66 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -53,6 +53,7 @@ #include "display/intel_dmc.h" #include "display/intel_dp.h" #include "display/intel_dpt.h" +#include "display/intel_encoder.h" #include "display/intel_fbdev.h" #include "display/intel_hotplug.h" #include "display/intel_overlay.h" @@ -933,50 +934,6 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) i915_gem_flush_free_objects(to_i915(dev)); } -static void intel_suspend_encoders(struct drm_i915_private *dev_priv) -{ - struct intel_encoder *encoder; - - if (!HAS_DISPLAY(dev_priv)) - return; - - /* - * TODO: check and remove holding the modeset locks if none of - * the encoders depends on this. - */ - drm_modeset_lock_all(&dev_priv->drm); - for_each_intel_encoder(&dev_priv->drm, encoder) - if (encoder->suspend) - encoder->suspend(encoder); - drm_modeset_unlock_all(&dev_priv->drm); - - for_each_intel_encoder(&dev_priv->drm, encoder) - if (encoder->suspend_complete) - encoder->suspend_complete(encoder); -} - -static void intel_shutdown_encoders(struct drm_i915_private *dev_priv) -{ - struct intel_encoder *encoder; - - if (!HAS_DISPLAY(dev_priv)) - return; - - /* - * TODO: check and remove holding the modeset locks if none of - * the encoders depends on this. - */ - drm_modeset_lock_all(&dev_priv->drm); - for_each_intel_encoder(&dev_priv->drm, encoder) - if (encoder->shutdown) - encoder->shutdown(encoder); - drm_modeset_unlock_all(&dev_priv->drm); - - for_each_intel_encoder(&dev_priv->drm, encoder) - if (encoder->shutdown_complete) - encoder->shutdown_complete(encoder); -} - void i915_driver_shutdown(struct drm_i915_private *i915) { disable_rpm_wakeref_asserts(&i915->runtime_pm); @@ -999,8 +956,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) if (HAS_DISPLAY(i915)) intel_display_driver_suspend_access(i915); - intel_suspend_encoders(i915); - intel_shutdown_encoders(i915); + intel_encoder_suspend_all(i915); + intel_encoder_shutdown_all(i915); intel_dmc_suspend(i915); @@ -1083,7 +1040,7 @@ static int i915_drm_suspend(struct drm_device *dev) if (HAS_DISPLAY(dev_priv)) intel_display_driver_suspend_access(dev_priv); - intel_suspend_encoders(dev_priv); + intel_encoder_suspend_all(dev_priv); /* Must be called before GGTT is suspended. */ intel_dpt_suspend(dev_priv);
Move the encoder suspend/shutdown helpers to intel_encoder.c, this being the logical place for encoder functions. This also allows sharing the above helpers with the xe driver, done in a follow-up patch. While at it rename the functions using the usual intel_encoder prefix and in the functions rename the dev_priv parameter to i915. Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/display/intel_encoder.c | 44 +++++++++++++++++ drivers/gpu/drm/i915/display/intel_encoder.h | 5 ++ drivers/gpu/drm/i915/i915_driver.c | 51 ++------------------ 3 files changed, 53 insertions(+), 47 deletions(-)