[Intel-gfx] [PATCH] drm/i915: Remove KMS Kconfig option

[Damien Lespiau]

On Fri, Jun 19, 2015 at 08:27:27PM +0100, Chris Wilson wrote:
> 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 at chris-wilson.co.uk>
> Cc: Daniel Veter <daniel.vetter at ffwll.ch>

Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>

-- 
Damien

> ---
>  arch/x86/configs/x86_64_defconfig |  1 -
>  drivers/gpu/drm/i915/Kconfig      |  9 ---------
>  drivers/gpu/drm/i915/i915_drv.c   | 20 +++++++-------------
>  3 files changed, 7 insertions(+), 23 deletions(-)
> 
> diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
> index 315b86106572..05630dfcb9f4 100644
> --- a/arch/x86/configs/x86_64_defconfig
> +++ b/arch/x86/configs/x86_64_defconfig
> @@ -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
> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> index 5f4b8c5d2bac..3cef5b18b9cb 100644
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@ -37,15 +37,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
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 6b87f949fc55..0ecd044d5d80 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1729,20 +1729,14 @@ 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;
> +	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)
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx