public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915/irq: Rename suspend/resume functions

Browse source 
Although these functions are used in runtime_pm, they are not
exclusively used there, so remove the misleading prefix.

Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240912172539.418957-3-rodrigo.vivi@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Rodrigo Vivi 2024-09-12 13:25:39 -04:00
parent acc7a9b2b9
commit 3de5774cb8
No known key found for this signature in database
GPG key ID: FA625F640EEB13CA
4 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/i915/gt/intel_reset.c
View file

@ -1233,7 +1233,7 @@ void intel_gt_reset(struct intel_gt *gt,
} }
if (INTEL_INFO(gt->i915)->gpu_reset_clobbers_display) if (INTEL_INFO(gt->i915)->gpu_reset_clobbers_display)
intel_runtime_pm_disable_interrupts(gt->i915); intel_irq_suspend(gt->i915);
if (do_reset(gt, stalled_mask)) { if (do_reset(gt, stalled_mask)) {
gt_err(gt, "Failed to reset chip\n"); gt_err(gt, "Failed to reset chip\n");
@ -1241,7 +1241,7 @@ void intel_gt_reset(struct intel_gt *gt,
} }
if (INTEL_INFO(gt->i915)->gpu_reset_clobbers_display) if (INTEL_INFO(gt->i915)->gpu_reset_clobbers_display)
intel_runtime_pm_enable_interrupts(gt->i915); intel_irq_resume(gt->i915);
intel_overlay_reset(gt->i915); intel_overlay_reset(gt->i915);

12
drivers/gpu/drm/i915/i915_driver.c
View file

@ -950,7 +950,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
intel_dp_mst_suspend(i915); intel_dp_mst_suspend(i915);
intel_runtime_pm_disable_interrupts(i915); intel_irq_suspend(i915);
intel_hpd_cancel_work(i915); intel_hpd_cancel_work(i915);
if (HAS_DISPLAY(i915)) if (HAS_DISPLAY(i915))
@ -1035,7 +1035,7 @@ static int i915_drm_suspend(struct drm_device *dev)
intel_dp_mst_suspend(dev_priv); intel_dp_mst_suspend(dev_priv);
intel_runtime_pm_disable_interrupts(dev_priv); intel_irq_suspend(dev_priv);
intel_hpd_cancel_work(dev_priv); intel_hpd_cancel_work(dev_priv);
if (HAS_DISPLAY(dev_priv)) if (HAS_DISPLAY(dev_priv))
@ -1181,7 +1181,7 @@ static int i915_drm_resume(struct drm_device *dev)
* Modeset enabling in intel_display_driver_init_hw() also needs working * Modeset enabling in intel_display_driver_init_hw() also needs working
* interrupts. * interrupts.
*/ */
intel_runtime_pm_enable_interrupts(dev_priv); intel_irq_resume(dev_priv);
if (HAS_DISPLAY(dev_priv)) if (HAS_DISPLAY(dev_priv))
drm_mode_config_reset(dev); drm_mode_config_reset(dev);
@ -1481,7 +1481,7 @@ static int intel_runtime_suspend(struct device *kdev)
for_each_gt(gt, dev_priv, i) for_each_gt(gt, dev_priv, i)
intel_gt_runtime_suspend(gt); intel_gt_runtime_suspend(gt);
intel_runtime_pm_disable_interrupts(dev_priv); intel_irq_suspend(dev_priv);
for_each_gt(gt, dev_priv, i) for_each_gt(gt, dev_priv, i)
intel_uncore_suspend(gt->uncore); intel_uncore_suspend(gt->uncore);
@ -1494,7 +1494,7 @@ static int intel_runtime_suspend(struct device *kdev)
"Runtime suspend failed, disabling it (%d)\n", ret); "Runtime suspend failed, disabling it (%d)\n", ret);
intel_uncore_runtime_resume(&dev_priv->uncore); intel_uncore_runtime_resume(&dev_priv->uncore);
intel_runtime_pm_enable_interrupts(dev_priv); intel_irq_resume(dev_priv);
for_each_gt(gt, dev_priv, i) for_each_gt(gt, dev_priv, i)
intel_gt_runtime_resume(gt); intel_gt_runtime_resume(gt);
@ -1587,7 +1587,7 @@ static int intel_runtime_resume(struct device *kdev)
for_each_gt(gt, dev_priv, i) for_each_gt(gt, dev_priv, i)
intel_uncore_runtime_resume(gt->uncore); intel_uncore_runtime_resume(gt->uncore);
intel_runtime_pm_enable_interrupts(dev_priv); intel_irq_resume(dev_priv);
/* /*
* No point of rolling back things in case of an error, as the best * No point of rolling back things in case of an error, as the best

30
drivers/gpu/drm/i915/i915_irq.c
View file

@ -1449,31 +1449,29 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv)
} }
/** /**
* intel_runtime_pm_disable_interrupts - runtime interrupt disabling * intel_irq_suspend - Suspend interrupts
* @dev_priv: i915 device instance * @i915: i915 device instance
* *
* This function is used to disable interrupts at runtime, both in the runtime * This function is used to disable interrupts at runtime.
* pm and the system suspend/resume code.
*/ */
void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv) void intel_irq_suspend(struct drm_i915_private *i915)
{ {
intel_irq_reset(dev_priv); intel_irq_reset(i915);
dev_priv->irqs_enabled = false; i915->irqs_enabled = false;
intel_synchronize_irq(dev_priv); intel_synchronize_irq(i915);
} }
/** /**
* intel_runtime_pm_enable_interrupts - runtime interrupt enabling * intel_irq_resume - Resume interrupts
* @dev_priv: i915 device instance * @i915: i915 device instance
* *
* This function is used to enable interrupts at runtime, both in the runtime * This function is used to enable interrupts at runtime.
* pm and the system suspend/resume code.
*/ */
void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv) void intel_irq_resume(struct drm_i915_private *i915)
{ {
dev_priv->irqs_enabled = true; i915->irqs_enabled = true;
intel_irq_reset(dev_priv); intel_irq_reset(i915);
intel_irq_postinstall(dev_priv); intel_irq_postinstall(i915);
} }
bool intel_irqs_enabled(struct drm_i915_private *dev_priv) bool intel_irqs_enabled(struct drm_i915_private *dev_priv)

4
drivers/gpu/drm/i915/i915_irq.h
View file

@ -34,8 +34,8 @@ void gen6_disable_rps_interrupts(struct drm_i915_private *dev_priv);
void gen6_rps_reset_ei(struct drm_i915_private *dev_priv); void gen6_rps_reset_ei(struct drm_i915_private *dev_priv);
u32 gen6_sanitize_rps_pm_mask(const struct drm_i915_private *i915, u32 mask); u32 gen6_sanitize_rps_pm_mask(const struct drm_i915_private *i915, u32 mask);
void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv); void intel_irq_suspend(struct drm_i915_private *i915);
void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv); void intel_irq_resume(struct drm_i915_private *i915);
bool intel_irqs_enabled(struct drm_i915_private *dev_priv); bool intel_irqs_enabled(struct drm_i915_private *dev_priv);
void intel_synchronize_irq(struct drm_i915_private *i915); void intel_synchronize_irq(struct drm_i915_private *i915);
void intel_synchronize_hardirq(struct drm_i915_private *i915); void intel_synchronize_hardirq(struct drm_i915_private *i915);