* [PATCH] drm/i915: Remove KMS Kconfig option
@ 2015-06-19 19:27 Chris Wilson
2015-06-22 11:11 ` Damien Lespiau
0 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2015-06-19 19:27 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Veter
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>
---
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@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Remove KMS Kconfig option
2015-06-19 19:27 [PATCH] drm/i915: Remove KMS Kconfig option Chris Wilson
@ 2015-06-22 11:11 ` Damien Lespiau
2015-06-22 14:17 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Damien Lespiau @ 2015-06-22 11:11 UTC (permalink / raw)
To: Chris Wilson; +Cc: Daniel Veter, intel-gfx
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@chris-wilson.co.uk>
> Cc: Daniel Veter <daniel.vetter@ffwll.ch>
Reviewed-by: Damien Lespiau <damien.lespiau@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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Remove KMS Kconfig option
2015-06-22 11:11 ` Damien Lespiau
@ 2015-06-22 14:17 ` Daniel Vetter
2015-06-23 10:46 ` Tvrtko Ursulin
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Vetter @ 2015-06-22 14:17 UTC (permalink / raw)
To: Damien Lespiau; +Cc: Daniel Veter, intel-gfx
On Mon, Jun 22, 2015 at 12:11:47PM +0100, Damien Lespiau wrote:
> 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@chris-wilson.co.uk>
> > Cc: Daniel Veter <daniel.vetter@ffwll.ch>
>
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Slight chance someone with an ums-only setup will get pissed about this.
But surely interesting to hear about those ;-)
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Remove KMS Kconfig option
2015-06-22 14:17 ` Daniel Vetter
@ 2015-06-23 10:46 ` Tvrtko Ursulin
2015-06-23 12:04 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Tvrtko Ursulin @ 2015-06-23 10:46 UTC (permalink / raw)
To: Daniel Vetter, Damien Lespiau; +Cc: Daniel Veter, intel-gfx
On 06/22/2015 03:17 PM, Daniel Vetter wrote:
> On Mon, Jun 22, 2015 at 12:11:47PM +0100, Damien Lespiau wrote:
>> 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@chris-wilson.co.uk>
>>> Cc: Daniel Veter <daniel.vetter@ffwll.ch>
>>
>> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
>
> Slight chance someone with an ums-only setup will get pissed about this.
> But surely interesting to hear about those ;-)
i915_drv.c:
#if defined(CONFIG_DRM_I915_KMS)
MODULE_DEVICE_TABLE(pci, pciidlist);
#endif
Ooops! :)
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Remove KMS Kconfig option
2015-06-23 10:46 ` Tvrtko Ursulin
@ 2015-06-23 12:04 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2015-06-23 12:04 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Daniel Veter, intel-gfx
On Tue, Jun 23, 2015 at 11:46:29AM +0100, Tvrtko Ursulin wrote:
>
> On 06/22/2015 03:17 PM, Daniel Vetter wrote:
> >On Mon, Jun 22, 2015 at 12:11:47PM +0100, Damien Lespiau wrote:
> >>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@chris-wilson.co.uk>
> >>>Cc: Daniel Veter <daniel.vetter@ffwll.ch>
> >>
> >>Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
> >
> >Slight chance someone with an ums-only setup will get pissed about this.
> >But surely interesting to hear about those ;-)
>
> i915_drv.c:
>
> #if defined(CONFIG_DRM_I915_KMS)
> MODULE_DEVICE_TABLE(pci, pciidlist);
> #endif
>
> Ooops! :)
Indeed. Patch submitted and dinq history rectified.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-23 12:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-19 19:27 [PATCH] drm/i915: Remove KMS Kconfig option Chris Wilson
2015-06-22 11:11 ` Damien Lespiau
2015-06-22 14:17 ` Daniel Vetter
2015-06-23 10:46 ` Tvrtko Ursulin
2015-06-23 12:04 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.