Ignore xserver provided mmio address. We already have it. From git.
authoroga <oga@openbsd.org>
Thu, 28 Aug 2008 18:29:08 +0000 (18:29 +0000)
committeroga <oga@openbsd.org>
Thu, 28 Aug 2008 18:29:08 +0000 (18:29 +0000)
sys/dev/pci/drm/i915_dma.c

index 96e9b42..e0232ab 100644 (file)
@@ -119,14 +119,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;
-       }
-
        if (init->sarea_priv_offset)
                dev_priv->sarea_priv = (drm_i915_sarea_t *)
                        ((u8 *) dev_priv->sarea->handle +
@@ -204,11 +196,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");