diff mbox

drm/i915: remove AGP dependency from DRM_I915 kconfig help text

Message ID 1477041257-8219-1-git-send-email-jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jani Nikula Oct. 21, 2016, 9:14 a.m. UTC
We haven't required AGP since 3e99a6b95614 ("drm/i915: Stop depending
upon CONFIG_AGP_INTEL"). Split/rearrange the paragraphs a bit while at
it.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/Kconfig | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Daniel Vetter Oct. 24, 2016, 8:52 a.m. UTC | #1
On Fri, Oct 21, 2016 at 12:14:17PM +0300, Jani Nikula wrote:
> We haven't required AGP since 3e99a6b95614 ("drm/i915: Stop depending
> upon CONFIG_AGP_INTEL"). Split/rearrange the paragraphs a bit while at
> it.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  drivers/gpu/drm/i915/Kconfig | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> index 1c1b19ccb92f..45a5eb71e8e6 100644
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@ -24,16 +24,17 @@ config DRM_I915
>  	  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
>  	  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
>  	  Core i5, Core i7 as well as Atom CPUs with integrated graphics.

Hm, nowadays it's called Intel HD graphics. Maybe we should mention that?
Feel free to add that.

> -	  If M is selected, the module will be called i915.  AGP support
> -	  is required for this driver to work. This driver is used by
> -	  the Intel driver in X.org 6.8 and XFree86 4.4 and above. It
> -	  replaces the older i830 module that supported a subset of the
> -	  hardware in older X.org releases.
> +
> +	  This driver is used by the Intel driver in X.org 6.8 and
> +	  XFree86 4.4 and above. It replaces the older i830 module that
> +	  supported a subset of the hardware in older X.org releases.
>  
>  	  Note that the older i810/i815 chipsets require the use of the
>  	  i810 driver instead, and the Atom z5xx series has an entirely
>  	  different implementation.
>  
> +	  If "M" is selected, the module will be called i915.
> +
>  config DRM_I915_PRELIMINARY_HW_SUPPORT
>  	bool "Enable preliminary support for prerelease Intel hardware by default"
>  	depends on DRM_I915
> -- 
> 2.1.4
>
Ville Syrjälä Oct. 24, 2016, 10:09 a.m. UTC | #2
On Mon, Oct 24, 2016 at 10:52:59AM +0200, Daniel Vetter wrote:
> On Fri, Oct 21, 2016 at 12:14:17PM +0300, Jani Nikula wrote:
> > We haven't required AGP since 3e99a6b95614 ("drm/i915: Stop depending
> > upon CONFIG_AGP_INTEL"). Split/rearrange the paragraphs a bit while at
> > it.
> > 
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> > ---
> >  drivers/gpu/drm/i915/Kconfig | 11 ++++++-----
> >  1 file changed, 6 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> > index 1c1b19ccb92f..45a5eb71e8e6 100644
> > --- a/drivers/gpu/drm/i915/Kconfig
> > +++ b/drivers/gpu/drm/i915/Kconfig
> > @@ -24,16 +24,17 @@ config DRM_I915
> >  	  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
> >  	  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
> >  	  Core i5, Core i7 as well as Atom CPUs with integrated graphics.
> 
> Hm, nowadays it's called Intel HD graphics. Maybe we should mention that?
> Feel free to add that.

HD graphics seems to be listed before the chipset names. But we do lack
a mention of the "Exterme Graphics" :) moniker that was used for gen2 IIRC.

> 
> > -	  If M is selected, the module will be called i915.  AGP support
> > -	  is required for this driver to work. This driver is used by
> > -	  the Intel driver in X.org 6.8 and XFree86 4.4 and above. It
> > -	  replaces the older i830 module that supported a subset of the
> > -	  hardware in older X.org releases.
> > +
> > +	  This driver is used by the Intel driver in X.org 6.8 and
> > +	  XFree86 4.4 and above. It replaces the older i830 module that
> > +	  supported a subset of the hardware in older X.org releases.
> >  
> >  	  Note that the older i810/i815 chipsets require the use of the
> >  	  i810 driver instead, and the Atom z5xx series has an entirely
> >  	  different implementation.
> >  
> > +	  If "M" is selected, the module will be called i915.
> > +
> >  config DRM_I915_PRELIMINARY_HW_SUPPORT
> >  	bool "Enable preliminary support for prerelease Intel hardware by default"
> >  	depends on DRM_I915
> > -- 
> > 2.1.4
> > 
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula Oct. 24, 2016, 2:07 p.m. UTC | #3
On Mon, 24 Oct 2016, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Mon, Oct 24, 2016 at 10:52:59AM +0200, Daniel Vetter wrote:
>> On Fri, Oct 21, 2016 at 12:14:17PM +0300, Jani Nikula wrote:
>> > We haven't required AGP since 3e99a6b95614 ("drm/i915: Stop depending
>> > upon CONFIG_AGP_INTEL"). Split/rearrange the paragraphs a bit while at
>> > it.
>> > 
>> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> 
>> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>> 
>> > ---
>> >  drivers/gpu/drm/i915/Kconfig | 11 ++++++-----
>> >  1 file changed, 6 insertions(+), 5 deletions(-)
>> > 
>> > diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
>> > index 1c1b19ccb92f..45a5eb71e8e6 100644
>> > --- a/drivers/gpu/drm/i915/Kconfig
>> > +++ b/drivers/gpu/drm/i915/Kconfig
>> > @@ -24,16 +24,17 @@ config DRM_I915
>> >  	  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
>> >  	  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
>> >  	  Core i5, Core i7 as well as Atom CPUs with integrated graphics.
>> 
>> Hm, nowadays it's called Intel HD graphics. Maybe we should mention that?
>> Feel free to add that.
>
> HD graphics seems to be listed before the chipset names. But we do lack
> a mention of the "Exterme Graphics" :) moniker that was used for gen2 IIRC.

Pushed as-is, thanks for the review.

BR,
Jani.

>
>> 
>> > -	  If M is selected, the module will be called i915.  AGP support
>> > -	  is required for this driver to work. This driver is used by
>> > -	  the Intel driver in X.org 6.8 and XFree86 4.4 and above. It
>> > -	  replaces the older i830 module that supported a subset of the
>> > -	  hardware in older X.org releases.
>> > +
>> > +	  This driver is used by the Intel driver in X.org 6.8 and
>> > +	  XFree86 4.4 and above. It replaces the older i830 module that
>> > +	  supported a subset of the hardware in older X.org releases.
>> >  
>> >  	  Note that the older i810/i815 chipsets require the use of the
>> >  	  i810 driver instead, and the Atom z5xx series has an entirely
>> >  	  different implementation.
>> >  
>> > +	  If "M" is selected, the module will be called i915.
>> > +
>> >  config DRM_I915_PRELIMINARY_HW_SUPPORT
>> >  	bool "Enable preliminary support for prerelease Intel hardware by default"
>> >  	depends on DRM_I915
>> > -- 
>> > 2.1.4
>> > 
>> 
>> -- 
>> Daniel Vetter
>> Software Engineer, Intel Corporation
>> http://blog.ffwll.ch
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 1c1b19ccb92f..45a5eb71e8e6 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -24,16 +24,17 @@  config DRM_I915
 	  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
 	  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
 	  Core i5, Core i7 as well as Atom CPUs with integrated graphics.
-	  If M is selected, the module will be called i915.  AGP support
-	  is required for this driver to work. This driver is used by
-	  the Intel driver in X.org 6.8 and XFree86 4.4 and above. It
-	  replaces the older i830 module that supported a subset of the
-	  hardware in older X.org releases.
+
+	  This driver is used by the Intel driver in X.org 6.8 and
+	  XFree86 4.4 and above. It replaces the older i830 module that
+	  supported a subset of the hardware in older X.org releases.
 
 	  Note that the older i810/i815 chipsets require the use of the
 	  i810 driver instead, and the Atom z5xx series has an entirely
 	  different implementation.
 
+	  If "M" is selected, the module will be called i915.
+
 config DRM_I915_PRELIMINARY_HW_SUPPORT
 	bool "Enable preliminary support for prerelease Intel hardware by default"
 	depends on DRM_I915