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

    PCIGART_ENABLED define for radeon, pcigart support now included for any
    arch.

6 files changed, 6 insertions, 40 deletions

diff --git a/linux-core/Config.in b/linux-core/Config.in
index d2940121e..45bba136d 100644
--- a/linux-core/Config.in
+++ b/linux-core/Config.in
@@ -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
 
diff --git a/linux-core/Kconfig b/linux-core/Kconfig
index 298a413cc..994371de2 100644
--- a/linux-core/Kconfig
+++ b/linux-core/Kconfig
@@ -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
diff --git a/linux/Config.in b/linux/Config.in
index d2940121e..45bba136d 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -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
 
diff --git a/linux/Kconfig b/linux/Kconfig
index 298a413cc..994371de2 100644
--- a/linux/Kconfig
+++ b/linux/Kconfig
@@ -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
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 460c06911..c9e72413d 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -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;
diff --git a/shared/radeon_cp.c b/shared/radeon_cp.c
index 460c06911..c9e72413d 100644
--- a/shared/radeon_cp.c
+++ b/shared/radeon_cp.c
@@ -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;