From 1c79efdd64ef797ddf9171978641e5ca60711c4b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 30 Jul 2008 12:36:08 -0700 Subject: [PATCH] --- yaml --- r: 115693 b: refs/heads/master c: 962d4fd7273e144ae003ddb90138ae4b80567c70 h: refs/heads/master i: 115691: e57c2cb8719c04347ba08e2b7774eae026d7f036 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_dma.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 6979afb799c1..5b7ca4e5a343 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0790d5e148c0747499742a3c09ba5f1c07f9ed0d +refs/heads/master: 962d4fd7273e144ae003ddb90138ae4b80567c70 diff --git a/trunk/drivers/gpu/drm/i915/i915_dma.c b/trunk/drivers/gpu/drm/i915/i915_dma.c index ae0ba3501880..28c812a0c634 100644 --- a/trunk/drivers/gpu/drm/i915/i915_dma.c +++ b/trunk/drivers/gpu/drm/i915/i915_dma.c @@ -121,13 +121,6 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) return -EINVAL; } - 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; - } - dev_priv->sarea_priv = (drm_i915_sarea_t *) ((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset); @@ -194,11 +187,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");