aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2022-08-30 12:34:10 +0300
committerJani Nikula <jani.nikula@intel.com>2022-08-31 18:34:10 +0300
commit6f10c4d62377c8a0b013ba98230abdae71cd7723 (patch)
treec28e821ed61aac25fc6eeb5f3bcacb42a66f9461
parentdrm/i915/pch: replace BUG_ON() with drm_WARN_ON() (diff)
downloadlinux-dev-6f10c4d62377c8a0b013ba98230abdae71cd7723.tar.xz
linux-dev-6f10c4d62377c8a0b013ba98230abdae71cd7723.zip
drm/i915/perf: replace BUG_ON() with WARN_ON()
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> Link: https://patchwork.freedesktop.org/patch/msgid/20220830093411.1511040-4-jani.nikula@intel.com
-rw-r--r--drivers/gpu/drm/i915/i915_perf.c3
1 files changed, 2 insertions, 1 deletions
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