* [PATCH] fb/intelfb: conflict with DRM_I915 and hide by default
@ 2009-07-03 18:24 Jesse Barnes
2009-07-18 0:13 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Jesse Barnes @ 2009-07-03 18:24 UTC (permalink / raw)
To: airlied, linux-kernel, linux-fbdev-devel
Users get confused by this driver. It's really a special purpose
embedded driver, and causes a lot of problems if enabled. So hide it
under EMBEDDED by default, and make sure it doesn't get enabled with
the i915 DRM driver.
Dave, I'm hoping you can feed this to Linus through your tree. It's
appropriate for 2.6.31 I think.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d6d65ef..ec12f7a 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1117,12 +1117,13 @@ config FB_CARILLO_RANCH
config FB_INTEL
tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
- depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
+ depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EMBEDDED
select FB_MODE_HELPERS
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
select FB_BOOT_VESA_SUPPORT if FB_INTEL = y
+ depends on !DRM_I915
help
This driver supports the on-board graphics built in to the Intel
830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] fb/intelfb: conflict with DRM_I915 and hide by default
2009-07-03 18:24 [PATCH] fb/intelfb: conflict with DRM_I915 and hide by default Jesse Barnes
@ 2009-07-18 0:13 ` Andrew Morton
2009-07-18 1:22 ` Jesse Barnes
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2009-07-18 0:13 UTC (permalink / raw)
To: Jesse Barnes; +Cc: airlied, linux-kernel, linux-fbdev-devel
On Fri, 3 Jul 2009 11:24:46 -0700
Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> Users get confused by this driver. It's really a special purpose
> embedded driver, and causes a lot of problems if enabled. So hide it
> under EMBEDDED by default, and make sure it doesn't get enabled with
> the i915 DRM driver.
>
> Dave, I'm hoping you can feed this to Linus through your tree. It's
> appropriate for 2.6.31 I think.
>
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index d6d65ef..ec12f7a 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -1117,12 +1117,13 @@ config FB_CARILLO_RANCH
>
> config FB_INTEL
> tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)"
> - depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
> + depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EMBEDDED
> select FB_MODE_HELPERS
> select FB_CFB_FILLRECT
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT
> select FB_BOOT_VESA_SUPPORT if FB_INTEL = y
> + depends on !DRM_I915
> help
> This driver supports the on-board graphics built in to the Intel
> 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets.
Nothing happened?
I'll merge this next week(ish) unless given a reason not to.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fb/intelfb: conflict with DRM_I915 and hide by default
2009-07-18 0:13 ` Andrew Morton
@ 2009-07-18 1:22 ` Jesse Barnes
2009-07-18 3:34 ` Dave Airlie
0 siblings, 1 reply; 4+ messages in thread
From: Jesse Barnes @ 2009-07-18 1:22 UTC (permalink / raw)
To: Andrew Morton; +Cc: airlied, linux-kernel, linux-fbdev-devel
On Fri, 17 Jul 2009 17:13:26 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:
> On Fri, 3 Jul 2009 11:24:46 -0700
> Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> > Users get confused by this driver. It's really a special purpose
> > embedded driver, and causes a lot of problems if enabled. So hide
> > it under EMBEDDED by default, and make sure it doesn't get enabled
> > with the i915 DRM driver.
> >
> > Dave, I'm hoping you can feed this to Linus through your tree. It's
> > appropriate for 2.6.31 I think.
> >
> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> >
> > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> > index d6d65ef..ec12f7a 100644
> > --- a/drivers/video/Kconfig
> > +++ b/drivers/video/Kconfig
> > @@ -1117,12 +1117,13 @@ config FB_CARILLO_RANCH
> >
> > config FB_INTEL
> > tristate "Intel
> > 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support
> > (EXPERIMENTAL)"
> > - depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
> > + depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
> > && EMBEDDED select FB_MODE_HELPERS
> > select FB_CFB_FILLRECT
> > select FB_CFB_COPYAREA
> > select FB_CFB_IMAGEBLIT
> > select FB_BOOT_VESA_SUPPORT if FB_INTEL = y
> > + depends on !DRM_I915
> > help
> > This driver supports the on-board graphics built in to
> > the Intel
> > 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM
> > chipsets.
>
> Nothing happened?
>
> I'll merge this next week(ish) unless given a reason not to.
It's in Dave's tree, pull requested to Linus already, so it should land
soon.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fb/intelfb: conflict with DRM_I915 and hide by default
2009-07-18 1:22 ` Jesse Barnes
@ 2009-07-18 3:34 ` Dave Airlie
0 siblings, 0 replies; 4+ messages in thread
From: Dave Airlie @ 2009-07-18 3:34 UTC (permalink / raw)
To: Jesse Barnes
Cc: airlied, Linus Torvalds, Andrew Morton, linux-fbdev-devel,
linux-kernel
On Sat, Jul 18, 2009 at 11:22 AM, Jesse Barnes<jbarnes@virtuousgeek.org> wrote:
> On Fri, 17 Jul 2009 17:13:26 -0700
> Andrew Morton <akpm@linux-foundation.org> wrote:
>
>> On Fri, 3 Jul 2009 11:24:46 -0700
>> Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>>
>> > Users get confused by this driver. It's really a special purpose
>> > embedded driver, and causes a lot of problems if enabled. So hide
>> > it under EMBEDDED by default, and make sure it doesn't get enabled
>> > with the i915 DRM driver.
>> >
>> > Dave, I'm hoping you can feed this to Linus through your tree. It's
>> > appropriate for 2.6.31 I think.
>> >
>> > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>> >
>> > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
>> > index d6d65ef..ec12f7a 100644
>> > --- a/drivers/video/Kconfig
>> > +++ b/drivers/video/Kconfig
>> > @@ -1117,12 +1117,13 @@ config FB_CARILLO_RANCH
>> >
>> > config FB_INTEL
>> > tristate "Intel
>> > 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support
>> > (EXPERIMENTAL)"
>> > - depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
>> > + depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL
>> > && EMBEDDED select FB_MODE_HELPERS
>> > select FB_CFB_FILLRECT
>> > select FB_CFB_COPYAREA
>> > select FB_CFB_IMAGEBLIT
>> > select FB_BOOT_VESA_SUPPORT if FB_INTEL = y
>> > + depends on !DRM_I915
>> > help
>> > This driver supports the on-board graphics built in to
>> > the Intel
>> > 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM
>> > chipsets.
>>
>> Nothing happened?
>>
>> I'll merge this next week(ish) unless given a reason not to.
>
> It's in Dave's tree, pull requested to Linus already, so it should land
> soon.
>
I suspect Linus isn't pulling from me post -rc2 anymore, or maybe
he just missed it.
Dave.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-18 3:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-03 18:24 [PATCH] fb/intelfb: conflict with DRM_I915 and hide by default Jesse Barnes
2009-07-18 0:13 ` Andrew Morton
2009-07-18 1:22 ` Jesse Barnes
2009-07-18 3:34 ` Dave Airlie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).