* Re: [PATCH] double DRM - fixes
@ 2001-08-10 13:33 Andrzej Krzysztofowicz
0 siblings, 0 replies; 3+ messages in thread
From: Andrzej Krzysztofowicz @ 2001-08-10 13:33 UTC (permalink / raw)
To: Alan Cox, kernel list, faith, elenstev
Hi,
This is update of Configure.help file related to the -ac10 DRM version
split and my suggested config fixes (Renamed config variables). Just
duplicated appropriate entries...
BTW: Alan, do you think it would be worth to be able to compile both versions
together (in the modular case) ?
Andrzej
************************************************************************
diff -uNr linux-2.4.7-ac10/Documentation/Configure.help linux/Documentation/Configure.help
--- linux-2.4.7-ac10/Documentation/Configure.help Wed Aug 8 20:13:56 2001
+++ linux/Documentation/Configure.help Fri Aug 10 09:29:55 2001
@@ -16158,6 +16158,12 @@
details. You should also select and configure AGP
(/dev/agpgart) support.
+Build drivers for new (XFree 4.1) DRM
+CONFIG_DRM_NEW
+ If you set this option, the new DRM version needed by XFree86 4.1
+ will be used. Otherwise, the old DRM version will be used,
+ appropriate for XFree86 4.0.
+
3dfx Banshee/Voodoo3+
CONFIG_DRM_TDFX
Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
@@ -16190,6 +16196,42 @@
Matrox g200/g400
CONFIG_DRM_MGA
+ Choose this option if you have a Matrox g200 or g400 graphics card. If M
+ is selected, the module will be called mga.o. AGP support is required
+ for this driver to work.
+
+3dfx Banshee/Voodoo3+
+CONFIG_DRM40_TDFX
+ Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
+ graphics card. If M is selected, the module will be called tdfx.o.
+
+3dlabs GMX 2000
+CONFIG_DRM40_GAMMA
+ Choose this option if you have a 3dlabs GMX 2000 graphics card.
+ If M is selected, the module will be called gamma.o.
+
+ATI Rage 128
+CONFIG_DRM40_R128
+ Choose this option if you have an ATI Rage 128 graphics card. If M
+ is selected, the module will be called r128.o. AGP support for
+ this card is strongly suggested (unless you have a PCI version).
+
+ATI Radeon
+CONFIG_DRM40_RADEON
+ Choose this option if you have an ATI Radeon graphics card. There
+ are both PCI and AGP versions. You don't need to choose this to
+ run the Radeon in plain VGA mode. There is a product page at
+ <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
+ If M is selected, the module will be called radeon.o.
+
+Intel I810
+CONFIG_DRM40_I810
+ Choose this option if you have an Intel I810 graphics card. If M is
+ selected, the module will be called i810.o. AGP support is required
+ for this driver to work.
+
+Matrox g200/g400
+CONFIG_DRM40_MGA
Choose this option if you have a Matrox g200 or g400 graphics card. If M
is selected, the module will be called mga.o. AGP support is required
for this driver to work.
--
=======================================================================
Andrzej M. Krzysztofowicz ankry@mif.pg.gda.pl
phone (48)(58) 347 14 61
Faculty of Applied Phys. & Math., Technical University of Gdansk
^ permalink raw reply [flat|nested] 3+ messages in thread[parent not found: <no.id>]
* [PATCH] double DRM - fixes
@ 2001-08-09 23:48 Andrzej Krzysztofowicz
0 siblings, 0 replies; 3+ messages in thread
From: Andrzej Krzysztofowicz @ 2001-08-09 23:48 UTC (permalink / raw)
To: Alan Cox, kernel list
Hi,
The following patch shold fix in -ac10
- configuration of DRM with xconfig
- build of ald drm driver
Andrzej
*************************************************
diff -uNr linux-2.4.7-ac10/Makefile linux/Makefile
--- linux-2.4.7-ac10/Makefile Thu Aug 9 02:50:37 2001
+++ linux/Makefile Fri Aug 10 00:40:31 2001
@@ -145,7 +145,8 @@
drivers/net/net.o \
drivers/media/media.o
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
-DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
+DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
+DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
diff -uNr linux-2.4.7-ac10/drivers/char/Config.in linux/drivers/char/Config.in
--- linux-2.4.7-ac10/drivers/char/Config.in Thu Aug 9 02:50:37 2001
+++ linux/drivers/char/Config.in Fri Aug 10 00:42:24 2001
@@ -203,6 +203,7 @@
if [ "$CONFIG_DRM_NEW" = "y" ]; then
source drivers/char/drm/Config.in
else
+ define_bool CONFIG_DRM_OLD y
source drivers/char/drm-4.0/Config.in
fi
fi
diff -uNr linux-2.4.7-ac10/drivers/char/Makefile linux/drivers/char/Makefile
--- linux-2.4.7-ac10/drivers/char/Makefile Sun Aug 5 21:15:51 2001
+++ linux/drivers/char/Makefile Fri Aug 10 00:41:19 2001
@@ -188,7 +188,8 @@
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
subdir-$(CONFIG_FTAPE) += ftape
-subdir-$(CONFIG_DRM) += drm
+subdir-$(CONFIG_DRM_NEW) += drm
+subdir-$(CONFIG_DRM_OLD) += drm-4.0
subdir-$(CONFIG_PCMCIA) += pcmcia
subdir-$(CONFIG_AGP) += agp
diff -uNr linux-2.4.7-ac10/drivers/char/drm-4.0/Config.in linux/drivers/char/drm-4.0/Config.in
--- linux-2.4.7-ac10/drivers/char/drm-4.0/Config.in Thu Aug 9 02:50:37 2001
+++ linux/drivers/char/drm-4.0/Config.in Thu Aug 9 22:55:50 2001
@@ -5,9 +5,9 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.x.
#
-tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX
-tristate ' 3dlabs GMX 2000' CONFIG_DRM_GAMMA
-dep_tristate ' ATI Rage 128' CONFIG_DRM_R128 $CONFIG_AGP
-dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP
-dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
-dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
+tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM40_TDFX
+tristate ' 3dlabs GMX 2000' CONFIG_DRM40_GAMMA
+dep_tristate ' ATI Rage 128' CONFIG_DRM40_R128 $CONFIG_AGP
+dep_tristate ' ATI Radeon' CONFIG_DRM40_RADEON $CONFIG_AGP
+dep_tristate ' Intel I810' CONFIG_DRM40_I810 $CONFIG_AGP
+dep_tristate ' Matrox g200/g400' CONFIG_DRM40_MGA $CONFIG_AGP
diff -uNr linux-2.4.7-ac10/drivers/char/drm-4.0/Makefile linux/drivers/char/drm-4.0/Makefile
--- linux-2.4.7-ac10/drivers/char/drm-4.0/Makefile Thu Aug 9 02:50:37 2001
+++ linux/drivers/char/drm-4.0/Makefile Thu Aug 9 22:55:38 2001
@@ -49,13 +49,13 @@
i810-objs := i810_drv.o i810_dma.o i810_context.o i810_bufs.o
radeon-objs := radeon_drv.o radeon_cp.o radeon_context.o radeon_bufs.o radeon_state.o
-obj-$(CONFIG_DRM_GAMMA) += gamma.o
-obj-$(CONFIG_DRM_TDFX) += tdfx.o
-obj-$(CONFIG_DRM_R128) += r128.o
-obj-$(CONFIG_DRM_RADEON)+= radeon.o
-obj-$(CONFIG_DRM_FFB) += ffb.o
-obj-$(CONFIG_DRM_MGA) += mga.o
-obj-$(CONFIG_DRM_I810) += i810.o
+obj-$(CONFIG_DRM40_GAMMA) += gamma.o
+obj-$(CONFIG_DRM40_TDFX) += tdfx.o
+obj-$(CONFIG_DRM40_R128) += r128.o
+obj-$(CONFIG_DRM40_RADEON)+= radeon.o
+obj-$(CONFIG_DRM40_FFB) += ffb.o
+obj-$(CONFIG_DRM40_MGA) += mga.o
+obj-$(CONFIG_DRM40_I810) += i810.o
# When linking into the kernel, link the library just once.
diff -uNr linux-2.4.7-ac10/drivers/char/drm-4.0/drm.h linux/drivers/char/drm-4.0/drm.h
--- linux-2.4.7-ac10/drivers/char/drm-4.0/drm.h Thu Aug 9 02:50:37 2001
+++ linux/drivers/char/drm-4.0/drm.h Thu Aug 9 22:56:43 2001
@@ -84,7 +84,7 @@
#include "i810_drm.h"
#include "r128_drm.h"
#include "radeon_drm.h"
-#ifdef CONFIG_DRM_SIS
+#ifdef CONFIG_DRM40_SIS
#include "sis_drm.h"
#endif
@@ -399,7 +399,7 @@
#define DRM_IOCTL_RADEON_STIPPLE DRM_IOW( 0x4c, drm_radeon_stipple_t)
#define DRM_IOCTL_RADEON_INDIRECT DRM_IOWR(0x4d, drm_radeon_indirect_t)
-#ifdef CONFIG_DRM_SIS
+#ifdef CONFIG_DRM40_SIS
/* SiS specific ioctls */
#define SIS_IOCTL_FB_ALLOC DRM_IOWR(0x44, drm_sis_mem_t)
#define SIS_IOCTL_FB_FREE DRM_IOW( 0x45, drm_sis_mem_t)
--
=======================================================================
Andrzej M. Krzysztofowicz ankry@mif.pg.gda.pl
phone (48)(58) 347 14 61
Faculty of Applied Phys. & Math., Technical University of Gdansk
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2001-08-10 14:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-08-10 13:33 [PATCH] double DRM - fixes Andrzej Krzysztofowicz
[not found] <no.id>
2001-08-10 14:20 ` Alan Cox
-- strict thread matches above, loose matches on Subject: below --
2001-08-09 23:48 Andrzej Krzysztofowicz
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).