diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 299ec6a..2ac3918 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -1351,7 +1351,10 @@ static int radeon_do_init_cp(drm_device_
 		DRM_DEBUG("Forcing AGP card to PCI mode\n");
 		dev_priv->flags &= ~CHIP_IS_AGP;
 	}
-	else if (!(dev_priv->flags & CHIP_IS_AGP))
+	else if (!init->is_pci &&
+		 !(dev_priv->flags & CHIP_IS_AGP) &&
+		 !(dev_priv->flags & CHIP_IS_PCI) &&
+		 !(dev_priv->flags & CHIP_IS_PCIE))
 	{
 		DRM_DEBUG("Restoring AGP flag\n");
 		dev_priv->flags |= CHIP_IS_AGP;
@@ -2215,9 +2220,10 @@ int radeon_driver_load(struct drm_device
 
 	if (drm_device_is_agp(dev))
 		dev_priv->flags |= CHIP_IS_AGP;
-
-	if (drm_device_is_pcie(dev))
+	else if (drm_device_is_pcie(dev))
 		dev_priv->flags |= CHIP_IS_PCIE;
+	else
+		dev_priv->flags |= CHIP_IS_PCI;
 
 	DRM_DEBUG("%s card detected\n",
 		  ((dev_priv->flags & CHIP_IS_AGP) ? "AGP" : (((dev_priv->flags & CHIP_IS_PCIE) ? "PCIE" : "PCI"))));
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index 63b5ace..ff75480 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -143,6 +143,7 @@ enum radeon_chip_flags {
 	CHIP_HAS_HIERZ = 0x00100000UL,
 	CHIP_IS_PCIE = 0x00200000UL,
 	CHIP_NEW_MEMMAP = 0x00400000UL,
+	CHIP_IS_PCI = 0x00800000UL,
 };
 
 #define GET_RING_HEAD(dev_priv)	(dev_priv->writeback_works ? \