diff options
| author | Imre Deak <imre.deak@intel.com> | 2024-06-18 15:52:54 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2024-06-20 19:47:54 +0300 |
| commit | b2c42f9d5ef0159635ba23f4dc2798c1fbcb7cb5 (patch) | |
| tree | f1be541bf1e255e1743d8eeace7214763ac89cc3 /drivers/gpu/drm/i915/display | |
| parent | cc2ee76a9003e1b5a7cd4f67ecf9b4b91d83299b (diff) | |
drm/i915: Pass intel_display to the encoder suspend/shutdown helpers
Pass intel_display to the encoder suspend/shutdown helpers instead of
drm_i915_private for better isolation.
v2: Pass intel_display to HAS_DISPLAY() as well, update commit log
accordingly. (Jani)
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> # v1
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240618125255.4080303-2-imre.deak@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_encoder.c | 24 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_encoder.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_encoder.c b/drivers/gpu/drm/i915/display/intel_encoder.c index 8a1dccb893a3..21d638535497 100644 --- a/drivers/gpu/drm/i915/display/intel_encoder.c +++ b/drivers/gpu/drm/i915/display/intel_encoder.c @@ -38,46 +38,46 @@ void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int dela &encoder->link_check_work, msecs_to_jiffies(delay_ms)); } -void intel_encoder_suspend_all(struct drm_i915_private *i915) +void intel_encoder_suspend_all(struct intel_display *display) { struct intel_encoder *encoder; - if (!HAS_DISPLAY(i915)) + if (!HAS_DISPLAY(display)) 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) + drm_modeset_lock_all(display->drm); + for_each_intel_encoder(display->drm, encoder) if (encoder->suspend) encoder->suspend(encoder); - drm_modeset_unlock_all(&i915->drm); + drm_modeset_unlock_all(display->drm); - for_each_intel_encoder(&i915->drm, encoder) + for_each_intel_encoder(display->drm, encoder) if (encoder->suspend_complete) encoder->suspend_complete(encoder); } -void intel_encoder_shutdown_all(struct drm_i915_private *i915) +void intel_encoder_shutdown_all(struct intel_display *display) { struct intel_encoder *encoder; - if (!HAS_DISPLAY(i915)) + if (!HAS_DISPLAY(display)) 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) + drm_modeset_lock_all(display->drm); + for_each_intel_encoder(display->drm, encoder) if (encoder->shutdown) encoder->shutdown(encoder); - drm_modeset_unlock_all(&i915->drm); + drm_modeset_unlock_all(display->drm); - for_each_intel_encoder(&i915->drm, encoder) + for_each_intel_encoder(display->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 04cfc0a72199..3fa5589f0b1c 100644 --- a/drivers/gpu/drm/i915/display/intel_encoder.h +++ b/drivers/gpu/drm/i915/display/intel_encoder.h @@ -6,7 +6,7 @@ #ifndef __INTEL_ENCODER_H__ #define __INTEL_ENCODER_H__ -struct drm_i915_private; +struct intel_display; struct intel_encoder; void intel_encoder_link_check_init(struct intel_encoder *encoder, @@ -14,7 +14,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); +void intel_encoder_suspend_all(struct intel_display *display); +void intel_encoder_shutdown_all(struct intel_display *display); #endif /* __INTEL_ENCODER_H__ */ |