[0/2] : the patch set to weaken the dependency between ACPI video driver and i915 driver
diff mbox

Message ID 20090415205656.GA32509@srcf.ucam.org
State Accepted
Headers show

Commit Message

Matthew Garrett April 15, 2009, 8:56 p.m. UTC
How about we just replace these with the following?

Comments

Len Brown April 23, 2009, 7:56 p.m. UTC | #1
applied

thanks,
Len Brown, Intel Open Source Technology Center

On Wed, 15 Apr 2009, Matthew Garrett wrote:

> How about we just replace these with the following?
> 
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index 3a22eb9..cf7e7c2 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -71,6 +71,7 @@ config DRM_I915
>  	select FB_CFB_COPYAREA
>  	select FB_CFB_IMAGEBLIT
>  	select FB
> +	select ACPI_VIDEO if ACPI
>  	tristate "i915 driver"
>  	help
>  	  Choose this option if you have a system that has Intel 830M, 845G,
> 
> -- 
> Matthew Garrett | mjg59@srcf.ucam.org
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andrew Morton April 30, 2009, 8:23 p.m. UTC | #2
(cc dri-devel)

On Thu, 23 Apr 2009 15:56:24 -0400 (EDT)
Len Brown <lenb@kernel.org> wrote:

> applied
> 
> thanks,
> Len Brown, Intel Open Source Technology Center
> 
> On Wed, 15 Apr 2009, Matthew Garrett wrote:
> 
> > How about we just replace these with the following?
> > 
> > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> > index 3a22eb9..cf7e7c2 100644
> > --- a/drivers/gpu/drm/Kconfig
> > +++ b/drivers/gpu/drm/Kconfig
> > @@ -71,6 +71,7 @@ config DRM_I915
> >  	select FB_CFB_COPYAREA
> >  	select FB_CFB_IMAGEBLIT
> >  	select FB
> > +	select ACPI_VIDEO if ACPI
> >  	tristate "i915 driver"
> >  	help
> >  	  Choose this option if you have a system that has Intel 830M, 845G,

You applied this a week ago, but it isn't in mainline or linux-next.
We La described it as fixing a regression and David John said

: Can you forward this patch to Linus?  This regression breaks quite a
: few configs where ACPI Video is compiled as a module and i915 is built
: in.  This should have been in stable, but I guess it's too late now.

So...  wazzup?
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 3a22eb9..cf7e7c2 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -71,6 +71,7 @@  config DRM_I915
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
 	select FB
+	select ACPI_VIDEO if ACPI
 	tristate "i915 driver"
 	help
 	  Choose this option if you have a system that has Intel 830M, 845G,