* [bk pull] DRM tree - stop i830/i915 in kernel
@ 2004-08-29 11:22 Dave Airlie
2004-08-29 11:40 ` Arjan van de Ven
0 siblings, 1 reply; 6+ messages in thread
From: Dave Airlie @ 2004-08-29 11:22 UTC (permalink / raw)
To: torvalds, Andrew Morton; +Cc: linux-kernel
Please do a
bk pull bk://drm.bkbits.net/drm-2.6
This will include the latest DRM changes and will update the following files:
drivers/char/drm/Kconfig | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
through these ChangeSets:
<airlied@starflyer.(none)> (04/08/29 1.1917)
Stop i830 and i915 being built at the same time into the kernel
Provide better info on which one is needed where...
Signed-off-by: Dave Airlie <airlied@linux.ie>
diff -Nru a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
--- a/drivers/char/drm/Kconfig Sun Aug 29 21:19:17 2004
+++ b/drivers/char/drm/Kconfig Sun Aug 29 21:19:17 2004
@@ -57,22 +57,24 @@
config DRM_I830
tristate "Intel 830M, 845G, 852GM, 855GM, 865G"
- depends on DRM && AGP && AGP_INTEL
+ depends on DRM && AGP && AGP_INTEL && !(DRM_I915=y)
help
Choose this option if you have a system that has Intel 830M, 845G,
852GM, 855GM or 865G integrated graphics. If M is selected, the
module will be called i830. AGP support is required for this driver
to work. This driver will eventually be replaced by the i915 one.
+ This driver should be used for systems running Xorg 6.7 and XFree86 4.4
+ or previous releases.
config DRM_I915
tristate "Intel 830M, 845G, 852GM, 855GM, 865G, 915G"
- depends on DRM && AGP && AGP_INTEL
+ depends on DRM && AGP && AGP_INTEL && !(DRM_I830=y)
help
Choose this option if you have a system that has Intel 830M, 845G,
852GM, 855GM 865G or 915G integrated graphics. If M is selected, the
module will be called i915. AGP support is required for this driver
- to work. This driver will eventually replace the I830 driver, when
- later release of X start to use the new DDX and DRI.
+ to work. This driver should be used for systems running Xorg 6.8 and
+ XFree86 releases after (but not including 4.4).
config DRM_MGA
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bk pull] DRM tree - stop i830/i915 in kernel
2004-08-29 11:22 [bk pull] DRM tree - stop i830/i915 in kernel Dave Airlie
@ 2004-08-29 11:40 ` Arjan van de Ven
2004-08-29 11:53 ` Christoph Hellwig
2004-08-29 11:55 ` Dave Airlie
0 siblings, 2 replies; 6+ messages in thread
From: Arjan van de Ven @ 2004-08-29 11:40 UTC (permalink / raw)
To: Dave Airlie; +Cc: torvalds, Andrew Morton, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 336 bytes --]
On Sun, 2004-08-29 at 13:22, Dave Airlie wrote:
> Please do a
>
> bk pull bk://drm.bkbits.net/drm-2.6
>
> This will include the latest DRM changes and will update the following files:
please don't do this.
This makes it not possible for distributions to ship kernels that need
to work on both old and new X versions....
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bk pull] DRM tree - stop i830/i915 in kernel
2004-08-29 11:40 ` Arjan van de Ven
@ 2004-08-29 11:53 ` Christoph Hellwig
2004-08-29 12:01 ` Dave Airlie
2004-08-29 11:55 ` Dave Airlie
1 sibling, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2004-08-29 11:53 UTC (permalink / raw)
To: Arjan van de Ven; +Cc: Dave Airlie, torvalds, Andrew Morton, linux-kernel
On Sun, Aug 29, 2004 at 01:40:04PM +0200, Arjan van de Ven wrote:
> On Sun, 2004-08-29 at 13:22, Dave Airlie wrote:
> > Please do a
> >
> > bk pull bk://drm.bkbits.net/drm-2.6
> >
> > This will include the latest DRM changes and will update the following files:
>
> please don't do this.
> This makes it not possible for distributions to ship kernels that need
> to work on both old and new X versions....
It just disables to have both builtin, no both modular. So it shouldn't
be a problem for you, but I wonder what the point is..
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bk pull] DRM tree - stop i830/i915 in kernel
2004-08-29 11:53 ` Christoph Hellwig
@ 2004-08-29 12:01 ` Dave Airlie
0 siblings, 0 replies; 6+ messages in thread
From: Dave Airlie @ 2004-08-29 12:01 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Arjan van de Ven, Dave Airlie, torvalds, Andrew Morton,
linux-kernel
>
> It just disables to have both builtin, no both modular. So it shouldn't
> be a problem for you, but I wonder what the point is..
they both work with the exact same hardware, when X starts up it traverses
the loaded DRMs asking for them by PCI ID, as both these drivers live on
the same set of PCIIDs (well the 915 has some new ones), X doesn't know
how to distinguish between them, so it picks the first one that says that
PCI ID is me, and in X.org with the i915 it picks the i830 driver and it
gets a bit shirty..
I suppose Tungsten Graphics could have done something extra (the famous
layer of indirection type stuff) but believed a clean breaak was best...
This patch just stops people shooting themselves in the foot ....
Dave.
--
David Airlie, Software Engineer
http://www.skynet.ie/~airlied / airlied@linux.ie
pam_smb / Linux DecStation / Linux VAX / ILUG person
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bk pull] DRM tree - stop i830/i915 in kernel
2004-08-29 11:40 ` Arjan van de Ven
2004-08-29 11:53 ` Christoph Hellwig
@ 2004-08-29 11:55 ` Dave Airlie
2004-08-29 11:57 ` Arjan van de Ven
1 sibling, 1 reply; 6+ messages in thread
From: Dave Airlie @ 2004-08-29 11:55 UTC (permalink / raw)
To: arjanv; +Cc: Dave Airlie, torvalds, Andrew Morton, linux-kernel
>
> please don't do this.
> This makes it not possible for distributions to ship kernels that need
> to work on both old and new X versions....
>
no, it'll stop distributions from shipping kernels with both drivers
built-in, modular kernels will work fine, X picks the driver to load, if
people are building in the drivers then I believe they know what they are
at...
Having both drivers built-in is obviously broken and actually doesn't work
at all (someone reported it in an Xorg bug...)
Dave.
--
David Airlie, Software Engineer
http://www.skynet.ie/~airlied / airlied@linux.ie
pam_smb / Linux DecStation / Linux VAX / ILUG person
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [bk pull] DRM tree - stop i830/i915 in kernel
2004-08-29 11:55 ` Dave Airlie
@ 2004-08-29 11:57 ` Arjan van de Ven
0 siblings, 0 replies; 6+ messages in thread
From: Arjan van de Ven @ 2004-08-29 11:57 UTC (permalink / raw)
To: Dave Airlie; +Cc: torvalds, Andrew Morton, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 619 bytes --]
On Sun, Aug 29, 2004 at 12:55:42PM +0100, Dave Airlie wrote:
>
> >
> > please don't do this.
> > This makes it not possible for distributions to ship kernels that need
> > to work on both old and new X versions....
> >
>
> no, it'll stop distributions from shipping kernels with both drivers
> built-in, modular kernels will work fine, X picks the driver to load, if
> people are building in the drivers then I believe they know what they are
> at...
>
> Having both drivers built-in is obviously broken and actually doesn't work
> at all (someone reported it in an Xorg bug...)
ok fair enough; ignore my objection
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-08-29 12:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-08-29 11:22 [bk pull] DRM tree - stop i830/i915 in kernel Dave Airlie
2004-08-29 11:40 ` Arjan van de Ven
2004-08-29 11:53 ` Christoph Hellwig
2004-08-29 12:01 ` Dave Airlie
2004-08-29 11:55 ` Dave Airlie
2004-08-29 11:57 ` Arjan van de Ven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox