Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Francois Dugast <francois.dugast@intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH 3/5] drm/xe: Annotate mcr_[un]lock()
Date: Wed, 17 Jan 2024 14:40:46 +0100	[thread overview]
Message-ID: <20240117134048.165425-4-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20240117134048.165425-1-thomas.hellstrom@linux.intel.com>

These functions acquire and release the gt::mcr_lock. Annotate
accordingly.
Fix the corresponding sparse warning.

Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
Fixes: fb1d55efdfcb ("drm/xe: Cleanup OPEN_BRACE style issues")
Cc: Francois Dugast <francois.dugast@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 drivers/gpu/drm/xe/xe_gt_mcr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c
index 77925b35cf8d..8546cd3cc50d 100644
--- a/drivers/gpu/drm/xe/xe_gt_mcr.c
+++ b/drivers/gpu/drm/xe/xe_gt_mcr.c
@@ -480,7 +480,7 @@ static bool xe_gt_mcr_get_nonterminated_steering(struct xe_gt *gt,
  * to synchronize with external clients (e.g., firmware), so a semaphore
  * register will also need to be taken.
  */
-static void mcr_lock(struct xe_gt *gt)
+static void mcr_lock(struct xe_gt *gt) __acquires(&gt->mcr_lock)
 {
 	struct xe_device *xe = gt_to_xe(gt);
 	int ret = 0;
@@ -500,7 +500,7 @@ static void mcr_lock(struct xe_gt *gt)
 	drm_WARN_ON_ONCE(&xe->drm, ret == -ETIMEDOUT);
 }
 
-static void mcr_unlock(struct xe_gt *gt)
+static void mcr_unlock(struct xe_gt *gt) __releases(&gt->mcr_lock)
 {
 	/* Release hardware semaphore - this is done by writing 1 to the register */
 	if (GRAPHICS_VERx100(gt_to_xe(gt)) >= 1270)
-- 
2.43.0


  parent reply	other threads:[~2024-01-17 13:41 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-17 13:40 [PATCH 0/5] Fixes for sparse warning Thomas Hellström
2024-01-17 13:40 ` [PATCH 1/5] drm/xe/dmabuf: Make xe_dmabuf_ops static Thomas Hellström
2024-01-17 13:48   ` Francois Dugast
2024-01-17 13:40 ` [PATCH 2/5] drm/xe/ggtt: Use ioread64 to dereference ggtt::gsm Thomas Hellström
2024-01-30 17:11   ` Matthew Brost
2024-01-17 13:40 ` Thomas Hellström [this message]
2024-01-30 17:18   ` [PATCH 3/5] drm/xe: Annotate mcr_[un]lock() Matthew Brost
2024-01-17 13:40 ` [PATCH 4/5] drm/xe: Don't use __user error pointers Thomas Hellström
2024-01-30 17:54   ` Matthew Brost
2024-01-17 13:40 ` [PATCH 5/5] drm/xe: Use a NULL pointer instead of 0 Thomas Hellström
2024-01-17 13:59   ` Francois Dugast
2024-01-17 23:12 ` ✓ CI.Patch_applied: success for Fixes for sparse warning Patchwork
2024-01-17 23:12 ` ✗ CI.checkpatch: warning " Patchwork
2024-01-17 23:13 ` ✓ CI.KUnit: success " Patchwork
2024-01-17 23:21 ` ✓ CI.Build: " Patchwork
2024-01-17 23:21 ` ✓ CI.Hooks: " Patchwork
2024-01-17 23:22 ` ✓ CI.checksparse: " Patchwork
2024-01-17 23:46 ` ✓ CI.BAT: " 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=20240117134048.165425-4-thomas.hellstrom@linux.intel.com \
    --to=thomas.hellstrom@linux.intel.com \
    --cc=francois.dugast@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=rodrigo.vivi@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