Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd930478 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Remove KMS Kconfig option 



Since we only support modesetting by default (disabling modesetting on
the command line prevents i915.ko from loading), having a parameter to
disable modesstting by default is superfluous, i.e. saying
CONFIG_DRM_I915_KMS=n is equivalent to CONFIG_DRM_I915=n.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Veter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent eebaed64

arch/x86/configs/x86_64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ CONFIG_AGP_AMD64=y 
CONFIG_AGP_INTEL=y

CONFIG_DRM=y

CONFIG_DRM_I915=y

CONFIG_DRM_I915_KMS=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y

CONFIG_FB_EFI=y

drivers/gpu/drm/i915/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -36,15 +36,6 @@ config DRM_I915 
	  i810 driver instead, and the Atom z5xx series has an entirely

	  different implementation.



config DRM_I915_KMS

	bool "Enable modesetting on intel by default"

	depends on DRM_I915

	default y

	help

	  Choose this option if you want kernel modesetting enabled by default.



	  If in doubt, say "Y".



config DRM_I915_FBDEV

	bool "Enable legacy fbdev support for the modesetting intel driver"

	depends on DRM_I915

drivers/gpu/drm/i915/i915_drv.c

+7 −13
Original line number Diff line number Diff line
@@ -1710,21 +1710,15 @@ static int __init i915_init(void) 
	driver.num_ioctls = i915_max_ioctl;



	/*

	 * If CONFIG_DRM_I915_KMS is set, default to KMS unless

	 * explicitly disabled with the module pararmeter.

	 *

	 * Otherwise, just follow the parameter (defaulting to off).

	 *

	 * Allow optional vga_text_mode_force boot option to override

	 * the default behavior.

	 * Enable KMS by default, unless explicitly overriden by

	 * either the i915.modeset prarameter or by the

	 * vga_text_mode_force boot option.

	 */

#if defined(CONFIG_DRM_I915_KMS)

	if (i915.modeset != 0)

		driver.driver_features |= DRIVER_MODESET;

#endif

	if (i915.modeset == 1)

	driver.driver_features |= DRIVER_MODESET;



	if (i915.modeset == 0)

		driver.driver_features &= ~DRIVER_MODESET;



#ifdef CONFIG_VGA_CONSOLE

	if (vgacon_text_force() && i915.modeset == -1)

		driver.driver_features &= ~DRIVER_MODESET;