43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From: Keith Packard <keithp@keithp.com>
|
|
Date: Wed, 30 Jul 2008 19:36:08 +0000 (-0700)
|
|
Subject: i915: Ignore X server provided mmio address
|
|
X-Git-Tag: v2.6.12-rc2
|
|
X-Git-Url: http://gitweb.freedesktop.org/?p=users/anholt/anholt/linux-2.6.git;a=commitdiff;h=5d34a0e06e6e70b01ee070094322695b9e3f0029
|
|
|
|
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>
|
|
---
|
|
|
|
--- 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_de
|
|
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_de
|
|
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");
|
|
|