summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-02-07 10:44:28 +0000
committerDave Airlie <airlied@linux.ie>2005-02-07 10:44:28 +0000
commit300e0866d68d40af9271a588bd93522e4e7a339c (patch)
tree392388ba6c75a21c1085ce8697e754438cfb108b
parent5a332a0f61760d8c13a01ba9f9208fafcafc3bb4 (diff)
fix agp detection on linux
-rw-r--r--linux-core/drmP.h5
-rw-r--r--shared-core/radeon_cp.c21
2 files changed, 6 insertions, 20 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index e5789c65..d417f97d 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -999,6 +999,11 @@ static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
return NULL;
}
+static __inline__ int drm_device_is_agp(drm_device_t *dev)
+{
+ return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
+}
+
static __inline__ void drm_core_dropmap(struct drm_map *map)
{
}
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 4606a332..7a06930a 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2006,9 +2006,6 @@ int radeon_cp_buffers(DRM_IOCTL_ARGS)
/* Always create a map record for MMIO and FB memory, done from DRIVER_POSTINIT */
int radeon_preinit(struct drm_device *dev, unsigned long flags)
{
-#if defined(__linux__)
- u32 save, temp;
-#endif
drm_radeon_private_t *dev_priv;
int ret = 0;
@@ -2043,28 +2040,12 @@ int radeon_preinit(struct drm_device *dev, unsigned long flags)
if (ret != 0)
return ret;
-#if defined(__linux__)
- /* There are signatures in BIOS and PCI-SSID for a PCI card, but they are not very reliable.
- Following detection method works for all cards tested so far.
- Note, checking AGP_ENABLE bit after drmAgpEnable call can also give the correct result.
- However, calling drmAgpEnable on a PCI card can cause some strange lockup when the server
- restarts next time.
- */
- pci_read_config_dword(dev->pdev, RADEON_AGP_COMMAND_PCI_CONFIG, &save);
- pci_write_config_dword(dev->pdev, RADEON_AGP_COMMAND_PCI_CONFIG,
- save | RADEON_AGP_ENABLE);
- pci_read_config_dword(dev->pdev, RADEON_AGP_COMMAND_PCI_CONFIG, &temp);
- pci_write_config_dword(dev->pdev, RADEON_AGP_COMMAND_PCI_CONFIG, save);
- if (temp & RADEON_AGP_ENABLE)
- dev_priv->flags |= CHIP_IS_AGP;
-#else
- /* The above method of detecting AGP is known to not work correctly,
+ /* The original method of detecting AGP is known to not work correctly,
* according to Mike Harris. The solution is to walk the capabilities
* list, which should be done in drm_device_is_agp().
*/
if (drm_device_is_agp(dev))
dev_priv->flags |= CHIP_IS_AGP;
-#endif
DRM_DEBUG("%s card detected\n",
((dev_priv->flags & CHIP_IS_AGP) ? "AGP" : "PCI"));