From: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
To: Krzysztof Niemiec <krzysztof.niemiec@intel.com>,
dri-devel@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
David Airlie <airlied@gmail.com>,
Krzysztof Karas <krzysztof.karas@intel.com>,
Sebastian Brzezinka <sebastian.brzezinka@intel.com>,
Andi Shyti <andi.shyti@linux.intel.com>
Subject: Re: [PATCH v4 2/2] drm/i915: Remove drm_dev_unregister() from the error path during i915_driver_register()
Date: Thu, 12 Nov 2026 14:54:53 +0100 [thread overview]
Message-ID: <2bcbf647f19be5441a816a02fe891079a9e88434.camel@linux.intel.com> (raw)
In-Reply-To: <20261104230555.71107-3-krzysztof.niemiec@intel.com>
On Thu, 2026-11-05 at 00:05 +0100, Krzysztof Niemiec wrote:
> During driver probe, in i915_driver_register(), if drm_dev_register()
> fails, the code enters into an error path. In it, a call to
> drm_dev_unregister() is made as part of cleanup in case drm_dev_register()
> returns an error. However, this is unnecessary, as in case of an error
> drm_dev_register() undoes its own setup in its own error path.
>
> Calling drm_dev_unregister() after a failed drm_dev_register() also
> generates a superfluous WARN_ON() from drm_client_sysrq_unregister().
> drm_client_sysrq_register() is only called in drm_dev_register() if
> there was no error in the latter. drm_dev_unregister() calls
> drm_client_sysrq_unregister() as it expects to be called after a successful
> drm_dev_register(), in which case the _sysrq_register() counterpart is
> called. However, if the call to drm_dev_register() failed,
> _sysrq_register() is never called; calling drm_dev_unregister() will
> cause _sysrq_unregister() to be called (unconditionally) with no
> corresponding _sysrq_register() call before it, which is caught in the
> aforementioned WARN_ON().
>
> Remove the redundant call to drm_dev_unregister() in case
> drm_dev_register() returns an error.
>
> Signed-off-by: Krzysztof Niemiec <krzysztof.niemiec@intel.com>
Reviewed-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
> ---
> Changelog:
>
> RFC -> ... -> v3:
> no functional changes
>
> v3 -> v4:
> * rebased
>
> drivers/gpu/drm/i915/i915_driver.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 5787f40ac62e..d25145b33db4 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -618,7 +618,6 @@ static int i915_driver_register(struct drm_i915_private *dev_priv)
> if (ret) {
> i915_probe_error(dev_priv,
> "Failed to register driver for userspace access!\n");
> - drm_dev_unregister(&dev_priv->drm);
> i915_pmu_unregister(dev_priv);
> i915_gem_driver_unregister(dev_priv);
> return ret;
next prev parent reply other threads:[~2026-11-12 13:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-04 23:05 [PATCH v4 0/2] DRM device registration fixes Krzysztof Niemiec
2026-11-04 23:05 ` [PATCH v4 1/2] drm: Set dev->registered back to false in drm_dev_register()'s error path Krzysztof Niemiec
2026-11-04 23:05 ` [PATCH v4 2/2] drm/i915: Remove drm_dev_unregister() from the error path during i915_driver_register() Krzysztof Niemiec
2026-11-12 13:54 ` Janusz Krzysztofik [this message]
2026-11-05 2:19 ` ✗ i915.CI.BAT: failure for DRM device registration fixes (rev3) 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=2bcbf647f19be5441a816a02fe891079a9e88434.camel@linux.intel.com \
--to=janusz.krzysztofik@linux.intel.com \
--cc=airlied@gmail.com \
--cc=andi.shyti@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=krzysztof.karas@intel.com \
--cc=krzysztof.niemiec@intel.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=sebastian.brzezinka@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