TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Pass intel_display to the encoder suspend/shutdown helpers

Browse Source 
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
This commit is contained in:
Imre Deak
2024-06-18 15:52:54 +03:00
parent cc2ee76a90
commit b2c42f9d5e
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/i915/display/intel_encoder.c
+12 -12
View File
@@ -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);
}
drivers/gpu/drm/i915/display/intel_encoder.h
+3 -3
View File
@@ -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__ */
drivers/gpu/drm/i915/i915_driver.c
+3 -3
View File
@@ -956,8 +956,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
if (HAS_DISPLAY(i915))
intel_display_driver_suspend_access(i915);
intel_encoder_suspend_all(i915);
intel_encoder_shutdown_all(i915);
intel_encoder_suspend_all(&i915->display);
intel_encoder_shutdown_all(&i915->display);
intel_dmc_suspend(i915);
@@ -1040,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_encoder_suspend_all(dev_priv);
intel_encoder_suspend_all(&dev_priv->display);
/* Must be called before GGTT is suspended. */
intel_dpt_suspend(dev_priv);