From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH v2 4/5] drm/i915/perf: replace BUG_ON() with WARN_ON()
Date: Tue, 30 Aug 2022 12:34:10 +0300 [thread overview]
Message-ID: <20220830093411.1511040-4-jani.nikula@intel.com> (raw)
In-Reply-To: <20220830093411.1511040-1-jani.nikula@intel.com>
Avoid BUG_ON(). Replace with WARN_ON() and early return.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_perf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index f3c23fe9ad9c..0defbb43ceea 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -1376,7 +1376,8 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream)
{
struct i915_perf *perf = stream->perf;
- BUG_ON(stream != perf->exclusive_stream);
+ if (WARN_ON(stream != perf->exclusive_stream))
+ return;
/*
* Unset exclusive_stream first, it will be checked while disabling
--
2.34.1
next prev parent reply other threads:[~2022-08-30 9:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 9:34 [Intel-gfx] [PATCH v2 1/5] drm/i915/crt: remove BUG_ON() Jani Nikula
2022-08-30 9:34 ` [Intel-gfx] [PATCH v2 2/5] drm/i915/dpll: replace BUG_ON() with drm_WARN_ON() Jani Nikula
2022-08-31 15:44 ` Andrzej Hajda
2022-08-31 15:55 ` Jani Nikula
2022-08-30 9:34 ` [Intel-gfx] [PATCH v2 3/5] drm/i915/pch: " Jani Nikula
2022-08-31 15:45 ` Andrzej Hajda
2022-08-30 9:34 ` Jani Nikula [this message]
2022-08-30 9:34 ` [Intel-gfx] [PATCH v2 5/5] drm/i915/fence: replace BUG_ON() with BUILD_BUG_ON() Jani Nikula
2022-08-30 9:50 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [v2,1/5] drm/i915/crt: remove BUG_ON() Patchwork
2022-08-30 10:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-08-31 13:30 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-08-31 14:46 ` [Intel-gfx] [PATCH v2 1/5] " Ville Syrjälä
2022-08-31 15:30 ` Andrzej Hajda
2022-08-31 15:41 ` Jani Nikula
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=20220830093411.1511040-4-jani.nikula@intel.com \
--to=jani.nikula@intel.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