Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 01/10] drm/i915/display: convert inner wakeref get towards get_if_in_use
@ 2024-03-07  0:15 Rodrigo Vivi
       [not found] ` <ZekKtpIobqZzyvDR@intel.com>
  0 siblings, 1 reply; 7+ messages in thread
From: Rodrigo Vivi @ 2024-03-07  0:15 UTC (permalink / raw)
  To: intel-xe; +Cc: intel-gfx, Rodrigo Vivi, Matthew Auld

This patch brings no functional change. Since at this point of
the code we are already asserting a wakeref was held, it means
that we are with runtime_pm 'in_use' and in practical terms we
are only bumping the pm_runtime usage counter and moving on.

However, xe driver has a lockdep annotation that warned us that
if a sync resume was actually called at this point, we could have
a deadlock because we are inside the power_domains->lock locked
area and the resume would call the irq_reset, which would also
try to get the power_domains->lock.

For this reason, let's convert this call to a safer option and
calm lockdep on.

Cc: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_power.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 6fd4fa52253a..4c5168a5bbf4 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -646,7 +646,7 @@ release_async_put_domains(struct i915_power_domains *power_domains,
 	 * power well disabling.
 	 */
 	assert_rpm_raw_wakeref_held(rpm);
-	wakeref = intel_runtime_pm_get(rpm);
+	wakeref = intel_runtime_pm_get_if_in_use(rpm);
 
 	for_each_power_domain(domain, mask) {
 		/* Clear before put, so put's sanity check is happy. */
-- 
2.43.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-03-15 11:16 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-07  0:15 [PATCH 01/10] drm/i915/display: convert inner wakeref get towards get_if_in_use Rodrigo Vivi
     [not found] ` <ZekKtpIobqZzyvDR@intel.com>
2024-03-07 14:46   ` Rodrigo Vivi
2024-03-07 20:14     ` Imre Deak
2024-03-08 15:19       ` Rodrigo Vivi
2024-03-11 15:06         ` Imre Deak
2024-03-11 18:36           ` Rodrigo Vivi
2024-03-15 11:16     ` Ville Syrjälä

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox