]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915: Downgrade device register error if injected
authorJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Fri, 14 Mar 2025 20:38:33 +0000 (21:38 +0100)
committerAndi Shyti <andi.shyti@linux.intel.com>
Wed, 19 Mar 2025 01:44:40 +0000 (02:44 +0100)
Commit 8f460e2c78f2 ("drm/i915: Demidlayer driver loading") which
introduced manual device registration also added a message that is
submitted on device registration failure as an error.  If that failure is
triggered by error injection test, that's an expected error, but CI still
reports it as a bug.  Fix it.

Suggested-by: Krzysztof Niemiec <krzysztof.niemiec@intel.com>
Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9820
Cc: Chris Wilson <chris.p.wilson@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: Krzysztof Niemiec <krzysztof.niemiec@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250314205202.809563-6-janusz.krzysztofik@linux.intel.com
drivers/gpu/drm/i915/i915_driver.c

index 6507dcfe4bf534db83c501606efaf39079fb6b68..e0dde7c0fa9c514c9e3811b8bc8f65a9a0d0b461 100644 (file)
@@ -635,8 +635,8 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
 
        /* Reveal our presence to userspace */
        if (drm_dev_register(&dev_priv->drm, 0)) {
-               drm_err(&dev_priv->drm,
-                       "Failed to register driver for userspace access!\n");
+               i915_probe_error(dev_priv,
+                                "Failed to register driver for userspace access!\n");
                return;
        }