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

Commit dabb7a91 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915: Remove use on gma_bus_addr on gen6+ 



We have enough info to not use the intel_gtt bridge stuff.

v2: Move setup of mappable_base above the legacy init stuff because we
still need that on older platforms. (Daniel)

v3: Remove the dev_priv hunk which was rebased in by accident

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> (v2)
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5d4545ae

drivers/gpu/drm/i915/i915_dma.c

+1 −2
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) 
	if (!ap)

		return;



	ap->ranges[0].base = dev_priv->mm.gtt->gma_bus_addr;

	ap->ranges[0].base = dev_priv->gtt.mappable_base;

	ap->ranges[0].size =

		dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT;

	primary =
@@ -1543,7 +1543,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	}



	aperture_size = dev_priv->mm.gtt->gtt_mappable_entries << PAGE_SHIFT;

	dev_priv->gtt.mappable_base = dev_priv->mm.gtt->gma_bus_addr;



	dev_priv->gtt.mappable =

		io_mapping_create_wc(dev_priv->gtt.mappable_base,

drivers/gpu/drm/i915/i915_gem_gtt.c

+2 −1
Original line number Diff line number Diff line
@@ -691,6 +691,8 @@ int i915_gem_gtt_init(struct drm_device *dev) 
	u16 snb_gmch_ctl;

	int ret;



	dev_priv->gtt.mappable_base = pci_resource_start(dev->pdev, 2);



	/* On modern platforms we need not worry ourself with the legacy

	 * hostbridge query stuff. Skip it entirely

	 */
@@ -723,7 +725,6 @@ int i915_gem_gtt_init(struct drm_device *dev) 


	/* For GEN6+ the PTEs for the ggtt live at 2MB + BAR0 */

	gtt_bus_addr = pci_resource_start(dev->pdev, 0) + (2<<20);

	dev_priv->mm.gtt->gma_bus_addr = pci_resource_start(dev->pdev, 2);



	/* i9xx_setup */

	pci_read_config_word(dev->pdev, SNB_GMCH_CTRL, &snb_gmch_ctl);

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ static int intel_init_ring_buffer(struct drm_device *dev, 
		goto err_unpin;



	ring->virtual_start =

		ioremap_wc(dev_priv->mm.gtt->gma_bus_addr + obj->gtt_offset,

		ioremap_wc(dev_priv->gtt.mappable_base + obj->gtt_offset,

			   ring->size);

	if (ring->virtual_start == NULL) {

		DRM_ERROR("Failed to map ringbuffer.\n");