From 985738f203f06aa630feaf4ef15b794ea50d3ee9 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 25 Mar 2006 07:16:14 +0000 Subject: radeon fix up the PCI ids for new memory map like the kernel one.. not perfect but should be very safe... align some other kernel bits i810 align with kernel --- shared-core/radeon_cp.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'shared-core/radeon_cp.c') diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 9ac83a00..80d63745 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1332,6 +1332,14 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) DRM_DEBUG("\n"); + /* if we require new memory map but we don't have it fail */ + if ((dev_priv->flags & CHIP_NEW_MEMMAP) && !dev_priv->new_memmap) + { + DRM_ERROR("Cannot initialise DRM on this card\nThis card requires a new X.org DDX for 3D\n"); + radeon_do_cleanup_cp(dev); + return DRM_ERR(EINVAL); + } + if (init->is_pci && (dev_priv->flags & CHIP_IS_AGP)) { DRM_DEBUG("Forcing AGP card to PCI mode\n"); -- cgit v1.2.3