geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove AGP dependency in kernel config for radeon, sis. Remove 

PCIGART_ENABLED define for radeon, pcigart support now included for any
    arch.
main
Leif Delgass 2003-04-22 21:30:24 +00:00
parent 22608a414d
commit 5ee61c18f4
6 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-core/Config.in
View File

@ -8,9 +8,9 @@
tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX
#tristate ' 3dlabs GMX 2000' CONFIG_DRM_GAMMA
tristate ' ATI Rage 128' CONFIG_DRM_R128
dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP
tristate ' ATI Radeon' CONFIG_DRM_RADEON
dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
dep_tristate ' Intel 830M/845G/852GM/855GM/865G' CONFIG_DRM_I830 $CONFIG_AGP
dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
dep_tristate ' SiS' CONFIG_DRM_SIS $CONFIG_AGP
tristate ' SiS' CONFIG_DRM_SIS

2
linux-core/Kconfig
View File

@ -39,7 +39,7 @@ config DRM_R128
config DRM_RADEON
tristate "ATI Radeon"
depends on DRM && AGP
depends on DRM
help
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

4
linux/Config.in
View File

@ -8,9 +8,9 @@
tristate ' 3dfx Banshee/Voodoo3+' CONFIG_DRM_TDFX
#tristate ' 3dlabs GMX 2000' CONFIG_DRM_GAMMA
tristate ' ATI Rage 128' CONFIG_DRM_R128
dep_tristate ' ATI Radeon' CONFIG_DRM_RADEON $CONFIG_AGP
tristate ' ATI Radeon' CONFIG_DRM_RADEON
dep_tristate ' Intel I810' CONFIG_DRM_I810 $CONFIG_AGP
dep_tristate ' Intel 830M/845G/852GM/855GM/865G' CONFIG_DRM_I830 $CONFIG_AGP
dep_tristate ' Matrox g200/g400' CONFIG_DRM_MGA $CONFIG_AGP
dep_tristate ' SiS' CONFIG_DRM_SIS $CONFIG_AGP
tristate ' SiS' CONFIG_DRM_SIS

2
linux/Kconfig
View File

@ -39,7 +39,7 @@ config DRM_R128
config DRM_RADEON
tristate "ATI Radeon"
depends on DRM && AGP
depends on DRM
help
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

17
shared-core/radeon_cp.c
View File

@ -36,12 +36,6 @@
#define RADEON_FIFO_DEBUG 0
#if defined(__alpha__) || defined(__powerpc__)
# define PCIGART_ENABLED
#else
# undef PCIGART_ENABLED
#endif
/* CP microcode (from ATI) */
static u32 R200_cp_microcode[][2] = {
@ -990,17 +984,6 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
dev_priv->is_pci = init->is_pci;
#if !defined(PCIGART_ENABLED)
/* PCI support is not 100% working, so we disable it here.
*/
if ( dev_priv->is_pci ) {
DRM_ERROR( "PCI GART not yet supported for Radeon!\n" );
dev->dev_private = (void *)dev_priv;
radeon_do_cleanup_cp(dev);
return DRM_ERR(EINVAL);
}
#endif
if ( dev_priv->is_pci && !dev->sg ) {
DRM_ERROR( "PCI GART memory not allocated!\n" );
dev->dev_private = (void *)dev_priv;

17
shared/radeon_cp.c
View File

@ -36,12 +36,6 @@
#define RADEON_FIFO_DEBUG 0
#if defined(__alpha__) || defined(__powerpc__)
# define PCIGART_ENABLED
#else
# undef PCIGART_ENABLED
#endif
/* CP microcode (from ATI) */
static u32 R200_cp_microcode[][2] = {
@ -990,17 +984,6 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
dev_priv->is_pci = init->is_pci;
#if !defined(PCIGART_ENABLED)
/* PCI support is not 100% working, so we disable it here.
*/
if ( dev_priv->is_pci ) {
DRM_ERROR( "PCI GART not yet supported for Radeon!\n" );
dev->dev_private = (void *)dev_priv;
radeon_do_cleanup_cp(dev);
return DRM_ERR(EINVAL);
}
#endif
if ( dev_priv->is_pci && !dev->sg ) {
DRM_ERROR( "PCI GART memory not allocated!\n" );
dev->dev_private = (void *)dev_priv;