Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 962d4fd7 authored by Keith Packard's avatar Keith Packard Committed by Dave Airlie
Browse files

i915: Ignore X server provided mmio address 



It is already correctly detected by the kernel for use in suspend/resume.

Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0790d5e1

drivers/gpu/drm/i915/i915_dma.c

+0 −12
Original line number Diff line number Diff line
@@ -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");