From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 1/5] drm/i915/crt: replace BUG_ON() with drm_WARN_ON()
Date: Fri, 26 Aug 2022 13:59:47 +0300 [thread overview]
Message-ID: <YwinoyX/6JxnnfM9@intel.com> (raw)
In-Reply-To: <766ca4049aeedeaaaef1158ca912173412885409.1661503049.git.jani.nikula@intel.com>
On Fri, Aug 26, 2022 at 11:38:13AM +0300, Jani Nikula wrote:
> Avoid BUG_ON(). Replace with drm_WARN_ON() and early return.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_crt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index 6a3893c8ff22..b92e2d0d14ea 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -643,7 +643,8 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
> struct i2c_adapter *i2c;
> bool ret = false;
>
> - BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG);
> + if (drm_WARN_ON(&dev_priv->drm, crt->base.type != INTEL_OUTPUT_ANALOG))
> + return false;
I'd just rip that out entirely. We don't have such checks anywhere else
eitheer.
>
> i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->vbt.crt_ddc_pin);
> edid = intel_crt_get_edid(connector, i2c);
> --
> 2.34.1
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2022-08-26 10:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 8:38 [Intel-gfx] [PATCH 0/5] drm/i915: some BUG_ON() removals Jani Nikula
2022-08-26 8:38 ` [Intel-gfx] [PATCH 1/5] drm/i915/crt: replace BUG_ON() with drm_WARN_ON() Jani Nikula
2022-08-26 10:59 ` Ville Syrjälä [this message]
2022-08-26 8:38 ` [Intel-gfx] [PATCH 2/5] drm/i915/dpll: " Jani Nikula
2022-08-26 11:08 ` Ville Syrjälä
2022-08-26 8:38 ` [Intel-gfx] [PATCH 3/5] drm/i915/pch: " Jani Nikula
2022-08-26 8:38 ` [Intel-gfx] [PATCH 4/5] drm/i915/perf: replace BUG_ON() with WARN_ON() Jani Nikula
2022-08-26 8:38 ` [Intel-gfx] [PATCH 5/5] drm/i915/fence: replace BUG_ON() with BUILD_BUG_ON() Jani Nikula
2022-08-26 10:07 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: some BUG_ON() removals Patchwork
2022-08-26 10:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-08-30 11:24 ` [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=YwinoyX/6JxnnfM9@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@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