code.ossystems Code Review - openembedded-core.git/blob

   1 From: Keith Packard <keithp@keithp.com>
   2 Date: Wed, 30 Jul 2008 19:36:08 +0000 (-0700)
   3 Subject: i915: Ignore X server provided mmio address
   4 X-Git-Tag: v2.6.12-rc2
   5 X-Git-Url: http://gitweb.freedesktop.org/?p=users/anholt/anholt/linux-2.6.git;a=commitdiff;h=5d34a0e06e6e70b01ee070094322695b9e3f0029
   6
   7 i915: Ignore X server provided mmio address
   8
   9 It is already correctly detected by the kernel for use in suspend/resume.
  10
  11 Signed-off-by: Eric Anholt <eric@anholt.net>
  12 ---
  13
  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_de
  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_de
  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");
  42