diff options
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.27-rc6/0003-i915-Ignore-X-server-provided-mmio-address.patch')
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.27-rc6/0003-i915-Ignore-X-server-provided-mmio-address.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.27-rc6/0003-i915-Ignore-X-server-provided-mmio-address.patch b/meta-moblin/packages/linux/linux-moblin-2.6.27-rc6/0003-i915-Ignore-X-server-provided-mmio-address.patch deleted file mode 100644 index 9f7e0b4bcd..0000000000 --- a/meta-moblin/packages/linux/linux-moblin-2.6.27-rc6/0003-i915-Ignore-X-server-provided-mmio-address.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | commit 20ae3cf7d4a9ae8d23bcffa67c9a34fc2640d217 | ||
2 | Author: Keith Packard <keithp@keithp.com> | ||
3 | Date: Wed Jul 30 12:36:08 2008 -0700 | ||
4 | |||
5 | i915: Ignore X server provided mmio address | ||
6 | |||
7 | It is already correctly detected by the kernel for use in suspend/resume. | ||
8 | |||
9 | Signed-off-by: Eric Anholt <eric@anholt.net> | ||
10 | Signed-off-by: Dave Airlie <airlied@redhat.com> | ||
11 | |||
12 | diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c | ||
13 | index 24adbde..01a869b 100644 | ||
14 | --- a/drivers/gpu/drm/i915/i915_dma.c | ||
15 | +++ b/drivers/gpu/drm/i915/i915_dma.c | ||
16 | @@ -121,13 +121,6 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init) | ||
17 | return -EINVAL; | ||
18 | } | ||
19 | |||
20 | - dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset); | ||
21 | - if (!dev_priv->mmio_map) { | ||
22 | - i915_dma_cleanup(dev); | ||
23 | - DRM_ERROR("can not find mmio map!\n"); | ||
24 | - return -EINVAL; | ||
25 | - } | ||
26 | - | ||
27 | dev_priv->sarea_priv = (drm_i915_sarea_t *) | ||
28 | ((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset); | ||
29 | |||
30 | @@ -194,11 +187,6 @@ static int i915_dma_resume(struct drm_device * dev) | ||
31 | return -EINVAL; | ||
32 | } | ||
33 | |||
34 | - if (!dev_priv->mmio_map) { | ||
35 | - DRM_ERROR("can not find mmio map!\n"); | ||
36 | - return -EINVAL; | ||
37 | - } | ||
38 | - | ||
39 | if (dev_priv->ring.map.handle == NULL) { | ||
40 | DRM_ERROR("can not ioremap virtual address for" | ||
41 | " ring buffer\n"); | ||