Commit b2fcb482 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: fail module probe on nomodeset and i915.modeset=0 



Since commit b30324ad ("drm/i915: Deprecated UMS support") we've
silently failed the probe, without propagating errors, on nomodeset and
i915.modeset=0. This has been to not upset userspace. See the above
commit for details.

Since then, we've removed both the UMS and KMS kconfig options in commit
03dae59c ("drm/i915: Ditch UMS config option") and commit
fd930478 ("drm/i915: Remove KMS Kconfig option") respectively.

Another ten years or so have passed. Continue with the deprecation by
actually failing the probe with nomodeset and i915.modeset=0.

Cc: Daniel Veter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1f34651ae8ae96dd5ecd9969b5bc43d23feda08c.1724843853.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b5d4657e

drivers/gpu/drm/i915/i915_module.c

+1 −2
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ static int i915_check_nomodeset(void) 
		use_kms = false;



	if (!use_kms) {

		/* Silently fail loading to not upset userspace. */

		DRM_DEBUG_DRIVER("KMS disabled.\n");

		return 1;

		return -ENODEV;

	}



	return 0;