aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-07-30 15:36:08 -0400
committerDave Airlie <airlied@linux.ie>2008-10-17 17:10:10 -0400
commit962d4fd7273e144ae003ddb90138ae4b80567c70 (patch)
treeb917d51a20c74d33d41ce18d0ebfb4e253650053 /drivers
parent0790d5e148c0747499742a3c09ba5f1c07f9ed0d (diff)
i915: Ignore X server provided mmio address
It is already correctly detected by the kernel for use in suspend/resume. Signed-off-by: Eric Anholt <eric@anholt.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index ae0ba3501880..28c812a0c634 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -121,13 +121,6 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
121 return -EINVAL; 121 return -EINVAL;
122 } 122 }
123 123
124 dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
125 if (!dev_priv->mmio_map) {
126 i915_dma_cleanup(dev);
127 DRM_ERROR("can not find mmio map!\n");
128 return -EINVAL;
129 }
130
131 dev_priv->sarea_priv = (drm_i915_sarea_t *) 124 dev_priv->sarea_priv = (drm_i915_sarea_t *)
132 ((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset); 125 ((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset);
133 126
@@ -194,11 +187,6 @@ static int i915_dma_resume(struct drm_device * dev)
194 return -EINVAL; 187 return -EINVAL;
195 } 188 }
196 189
197 if (!dev_priv->mmio_map) {
198 DRM_ERROR("can not find mmio map!\n");
199 return -EINVAL;
200 }
201
202 if (dev_priv->ring.map.handle == NULL) { 190 if (dev_priv->ring.map.handle == NULL) {
203 DRM_ERROR("can not ioremap virtual address for" 191 DRM_ERROR("can not ioremap virtual address for"
204 " ring buffer\n"); 192 " ring buffer\n");