niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915: Remove KMS Kconfig option

Browse source 
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: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Veter <daniel.vetter@ffwll.ch>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2015-06-19 20:27:27 +01:00 • committed by Daniel Vetter
parent eebaed646a
commit fd930478fb
3 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/configs/x86_64_defconfig
View file

@ -207,7 +207,6 @@ CONFIG_AGP_AMD64=y
CONFIG_AGP_INTEL=y CONFIG_AGP_INTEL=y
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_I915=y CONFIG_DRM_I915=y
CONFIG_DRM_I915_KMS=y
CONFIG_FB_MODE_HELPERS=y CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y CONFIG_FB_TILEBLITTING=y
CONFIG_FB_EFI=y CONFIG_FB_EFI=y

9
drivers/gpu/drm/i915/Kconfig
View file

@ -36,15 +36,6 @@ config DRM_I915
i810 driver instead, and the Atom z5xx series has an entirely i810 driver instead, and the Atom z5xx series has an entirely
different implementation. 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 config DRM_I915_FBDEV
bool "Enable legacy fbdev support for the modesetting intel driver" bool "Enable legacy fbdev support for the modesetting intel driver"
depends on DRM_I915 depends on DRM_I915

18
drivers/gpu/drm/i915/i915_drv.c
View file

@ -1710,21 +1710,15 @@ static int __init i915_init(void)
driver.num_ioctls = i915_max_ioctl; driver.num_ioctls = i915_max_ioctl;
/* /*
* If CONFIG_DRM_I915_KMS is set, default to KMS unless * Enable KMS by default, unless explicitly overriden by
* explicitly disabled with the module pararmeter. * either the i915.modeset prarameter or by the
* * vga_text_mode_force boot option.
* Otherwise, just follow the parameter (defaulting to off).
*
* Allow optional vga_text_mode_force boot option to override
* the default behavior.
*/ */
#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; driver.driver_features |= DRIVER_MODESET;
if (i915.modeset == 0)
driver.driver_features &= ~DRIVER_MODESET;
#ifdef CONFIG_VGA_CONSOLE #ifdef CONFIG_VGA_CONSOLE
if (vgacon_text_force() && i915.modeset == -1) if (vgacon_text_force() && i915.modeset == -1)
driver.driver_features &= ~DRIVER_MODESET; driver.driver_features &= ~DRIVER_MODESET;