Ignore X server provided mmio address
authorKeith Packard <keithp@keithp.com>
Thu, 5 Jun 2008 20:49:21 +0000 (13:49 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 6 Jun 2008 20:00:46 +0000 (13:00 -0700)
shared-core/i915_dma.c

index a948834..37c822c 100644 (file)
@@ -214,14 +214,6 @@ static int i915_initialize(struct drm_device * dev,
                return -EINVAL;
        }
 
-       if (init->mmio_offset != 0)
-               dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
-       if (!dev_priv->mmio_map) {
-               i915_dma_cleanup(dev);
-               DRM_ERROR("can not find mmio map!\n");
-               return -EINVAL;
-       }
-
 #ifdef I915_HAVE_BUFFER
        dev_priv->max_validate_buffers = I915_MAX_VALIDATE_BUFFERS;
 #endif
@@ -323,11 +315,6 @@ static int i915_dma_resume(struct drm_device * dev)
                return -EINVAL;
        }
 
-       if (!dev_priv->mmio_map) {
-               DRM_ERROR("can not find mmio map!\n");
-               return -EINVAL;
-       }
-
        if (dev_priv->ring.map.handle == NULL) {
                DRM_ERROR("can not ioremap virtual address for"
                          " ring buffer\n");