From: Janusz Krzysztofik Date: Fri, 14 Mar 2025 20:38:33 +0000 (+0100) Subject: drm/i915: Downgrade device register error if injected X-Git-Tag: v6.16-rc1~144^2~20^2~124 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ae485e3d11d34cb70fcfebf149f5f4fce97f089;p=thirdparty%2Flinux.git drm/i915: Downgrade device register error if injected 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 Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9820 Cc: Chris Wilson Cc: Daniel Vetter Signed-off-by: Janusz Krzysztofik Reviewed-by: Krzysztof Niemiec Reviewed-by: Andi Shyti Signed-off-by: Andi Shyti Link: https://patchwork.freedesktop.org/patch/msgid/20250314205202.809563-6-janusz.krzysztofik@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 6507dcfe4bf53..e0dde7c0fa9c5 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -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; }