Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Gustavo Sousa <gustavo.sousa@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: Luca Coelho <luciano.coelho@intel.com>,
	Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH v2 04/17] drm/i915/dmc_wl: Check for non-zero refcount in release work
Date: Wed,  6 Nov 2024 18:50:30 -0300	[thread overview]
Message-ID: <20241106215231.103474-5-gustavo.sousa@intel.com> (raw)
In-Reply-To: <20241106215231.103474-1-gustavo.sousa@intel.com>

When the DMC wakelock refcount reaches zero, we know that there are no
users and that we can do the actual release operation on the hardware,
which is queued with a delayed work. The idea of the delayed work is to
avoid performing the release if a new lock user appears (i.e. refcount
gets incremented) in a very short period of time.

Based on the above, the release work should bail out if refcount is
non-zero (meaning new lock users appeared in the meantime), but our
current code actually does the opposite: it bails when refcount is zero.
That means that the wakelock is not released when it should be; and
that, when the work is not canceled in time, it ends up being releasing
when it should not.

Fix that by inverting the condition.

Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dmc_wl.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dmc_wl.c b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
index 9255505437d5..a0a060706305 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc_wl.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc_wl.c
@@ -76,8 +76,11 @@ static void intel_dmc_wl_work(struct work_struct *work)
 
 	spin_lock_irqsave(&wl->lock, flags);
 
-	/* Bail out if refcount reached zero while waiting for the spinlock */
-	if (!refcount_read(&wl->refcount))
+	/*
+	 * Bail out if refcount became non-zero while waiting for the spinlock,
+	 * meaning that the lock is now taken again.
+	 */
+	if (refcount_read(&wl->refcount))
 		goto out_unlock;
 
 	__intel_de_rmw_nowl(display, DMC_WAKELOCK1_CTL, DMC_WAKELOCK_CTL_REQ, 0);
-- 
2.47.0


  parent reply	other threads:[~2024-11-06 21:52 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-06 21:50 [PATCH v2 00/17] drm/i915/dmc_wl: Fixes and enablement for Xe3_LPD Gustavo Sousa
2024-11-06 21:50 ` [PATCH v2 01/17] drm/i915/dmc_wl: Use i915_mmio_reg_offset() instead of reg.reg Gustavo Sousa
2024-11-07  9:23   ` Jani Nikula
2024-11-07 10:39   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 02/17] drm/xe: Mimic i915 behavior for non-sleeping MMIO wait Gustavo Sousa
2024-11-07 10:40   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 03/17] drm/i915/dmc_wl: Use non-sleeping variant of " Gustavo Sousa
2024-11-07 10:42   ` Luca Coelho
2024-11-06 21:50 ` Gustavo Sousa [this message]
2024-11-06 21:50 ` [PATCH v2 05/17] drm/i915/dmc_wl: Get wakelock when disabling dynamic DC states Gustavo Sousa
2024-11-07 10:43   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 06/17] drm/i915/dmc_wl: Use sentinel item for range tables Gustavo Sousa
2024-11-06 21:50 ` [PATCH v2 07/17] drm/i915/dmc_wl: Extract intel_dmc_wl_reg_in_range() Gustavo Sousa
2024-11-07 10:44   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 08/17] drm/i915/dmc_wl: Rename lnl_wl_range to powered_off_ranges Gustavo Sousa
2024-11-07 10:46   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 09/17] drm/i915/dmc_wl: Track registers touched by the DMC Gustavo Sousa
2024-11-07 10:47   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 10/17] drm/i915/dmc_wl: Allow simpler syntax for single reg in range tables Gustavo Sousa
2024-11-07 10:48   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 11/17] drm/i915/dmc_wl: Deal with existing references when disabling Gustavo Sousa
2024-11-06 21:50 ` [PATCH v2 12/17] drm/i915/dmc_wl: Couple enable/disable with dynamic DC states Gustavo Sousa
2024-11-06 21:50 ` [PATCH v2 13/17] drm/i915/dmc_wl: Add and use HAS_DMC_WAKELOCK() Gustavo Sousa
2024-11-07 10:49   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 14/17] drm/i915/dmc_wl: Init only after we have runtime device info Gustavo Sousa
2024-11-07 10:50   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 15/17] drm/i915/dmc_wl: Use HAS_DMC() in HAS_DMC_WAKELOCK() Gustavo Sousa
2024-11-07 10:51   ` Luca Coelho
2024-11-06 21:50 ` [PATCH v2 16/17] drm/i915/dmc_wl: Sanitize enable_dmc_wl according to hardware support Gustavo Sousa
2024-11-06 21:50 ` [PATCH v2 17/17] drm/i915/xe3lpd: Use DMC wakelock by default Gustavo Sousa
2024-11-07 10:51   ` Luca Coelho
2024-11-07  1:23 ` ✓ CI.Patch_applied: success for drm/i915/dmc_wl: Fixes and enablement for Xe3_LPD (rev2) Patchwork
2024-11-07  1:24 ` ✗ CI.checkpatch: warning " Patchwork
2024-11-07  1:25 ` ✓ CI.KUnit: success " Patchwork
2024-11-07  1:37 ` ✓ CI.Build: " Patchwork
2024-11-07  1:39 ` ✓ CI.Hooks: " Patchwork
2024-11-07  1:40 ` ✗ CI.checksparse: warning " Patchwork
2024-11-07  2:00 ` ✓ CI.BAT: success " Patchwork
2024-11-08  7:06 ` ✗ CI.FULL: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241106215231.103474-5-gustavo.sousa@intel.com \
    --to=gustavo.sousa@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=luciano.coelho@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox