diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-07-19 19:16:26 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-07-19 19:16:26 +0200 |
| commit | 2a47f6bfecea5dabcbf79d5e1aaf271f50070b89 (patch) | |
| tree | 3433e97088ae797be32a09bfbfda5959f25bc2ca /shared-core/radeon_cp.c | |
| parent | c91748e702af1c59d88a4b6c2afb20a781dc6660 (diff) | |
Make sure CHIP_IS_AGP flag is set when not overriding to PCI mode.
This allows using AGP after overriding to PCI mode in a previous session
without reloading the DRM.
Diffstat (limited to 'shared-core/radeon_cp.c')
| -rw-r--r-- | shared-core/radeon_cp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 54763fc5..5f953a42 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1351,6 +1351,11 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) DRM_DEBUG("Forcing AGP card to PCI mode\n"); dev_priv->flags &= ~CHIP_IS_AGP; } + else if (!(dev_priv->flags & CHIP_IS_AGP)) + { + DRM_DEBUG("Restoring AGP flag\n"); + dev_priv->flags |= CHIP_IS_AGP; + } if ((!(dev_priv->flags & CHIP_IS_AGP)) && !dev->sg) { DRM_ERROR("PCI GART memory not allocated!\n"); |