From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-gfx] [PATCH] drm/i915/slpc: Fix inconsistent locked return
Date: Tue, 30 Aug 2022 11:02:29 -0400 [thread overview]
Message-ID: <20220830150229.165214-1-rodrigo.vivi@intel.com> (raw)
Fix for intel_guc_slpc_set_min_freq() warn: inconsistent returns '&slpc->lock'.
Fixes: 95ccf312a1e4 ("drm/i915/guc/slpc: Allow SLPC to use efficient frequency")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
index 9d49ccef03bb..f8a2bbcdf14f 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
@@ -477,7 +477,7 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)
if (unlikely(ret)) {
i915_probe_error(i915, "Failed to toggle efficient freq (%pe)\n",
ERR_PTR(ret));
- return ret;
+ goto unlock;
}
ret = slpc_set_param(slpc,
@@ -492,6 +492,7 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)
if (!ret)
slpc->min_freq_softlimit = val;
+unlock:
mutex_unlock(&slpc->lock);
return ret;
--
2.37.2
next reply other threads:[~2022-08-30 15:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 15:02 Rodrigo Vivi [this message]
2022-08-30 15:23 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/slpc: Fix inconsistent locked return Patchwork
2022-08-30 15:30 ` [Intel-gfx] [PATCH] " Dixit, Ashutosh
2022-08-30 19:35 ` Rodrigo Vivi
2022-08-30 21:23 ` Dixit, Ashutosh
2022-08-30 15:42 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2022-08-30 21:17 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/slpc: Fix inconsistent locked return (rev2) Patchwork
2022-08-31 16:22 ` [Intel-gfx] ✗ Fi.CI.IGT: 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=20220830150229.165214-1-rodrigo.vivi@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=dan.carpenter@oracle.com \
--cc=intel-gfx@lists.freedesktop.org \
/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