drm: add new radeon PCI ids..

[cascardo/linux.git] / drivers / char / drm / radeon_cp.c

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index cc4942a..7f949c9 100644 (file)
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/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\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");