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

Commit 73ebd503 authored by Matthew Auld's avatar Matthew Auld Committed by Joonas Lahtinen
Browse files

drm/i915: make mappable struct resource centric 



Now that we are using struct resource to track the stolen region, it is
more convenient if we track the mappable region in a resource as well.

v2: prefer iomap and gmadr naming scheme
    prefer DEFINE_RES_MEM

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171211151822.20953-8-matthew.auld@intel.com
parent 17a05345

drivers/gpu/drm/i915/gvt/gvt.h

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt); 


/* Aperture/GM space definitions for GVT device */

#define gvt_aperture_sz(gvt)	  (gvt->dev_priv->ggtt.mappable_end)

#define gvt_aperture_pa_base(gvt) (gvt->dev_priv->ggtt.mappable_base)

#define gvt_aperture_pa_base(gvt) (gvt->dev_priv->ggtt.gmadr.start)



#define gvt_ggtt_gm_sz(gvt)	  (gvt->dev_priv->ggtt.base.total)

#define gvt_ggtt_sz(gvt) \

drivers/gpu/drm/i915/i915_drv.c

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

		return -ENOMEM;



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

	ap->ranges[0].base = ggtt->gmadr.start;

	ap->ranges[0].size = ggtt->mappable_end;



	primary =

drivers/gpu/drm/i915/i915_gem.c

+4 −4
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ i915_gem_gtt_pread(struct drm_i915_gem_object *obj, 
			page_base += offset & PAGE_MASK;

		}



		if (gtt_user_read(&ggtt->mappable, page_base, page_offset,

		if (gtt_user_read(&ggtt->iomap, page_base, page_offset,

				  user_data, page_length)) {

			ret = -EFAULT;

			break;
@@ -1324,7 +1324,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj, 
		 * If the object is non-shmem backed, we retry again with the

		 * path that handles page fault.

		 */

		if (ggtt_write(&ggtt->mappable, page_base, page_offset,

		if (ggtt_write(&ggtt->iomap, page_base, page_offset,

			       user_data, page_length)) {

			ret = -EFAULT;

			break;
@@ -1967,9 +1967,9 @@ int i915_gem_fault(struct vm_fault *vmf) 
	/* Finally, remap it using the new GTT offset */

	ret = remap_io_mapping(area,

			       area->vm_start + (vma->ggtt_view.partial.offset << PAGE_SHIFT),

			       (ggtt->mappable_base + vma->node.start) >> PAGE_SHIFT,

			       (ggtt->gmadr.start + vma->node.start) >> PAGE_SHIFT,

			       min_t(u64, vma->size, area->vm_end - area->vm_start),

			       &ggtt->mappable);

			       &ggtt->iomap);

	if (ret)

		goto err_fence;

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj, 
		offset += page << PAGE_SHIFT;

	}



	vaddr = (void __force *)io_mapping_map_atomic_wc(&ggtt->mappable,

	vaddr = (void __force *)io_mapping_map_atomic_wc(&ggtt->iomap,

							 offset);

	cache->page = page;

	cache->vaddr = (unsigned long)vaddr;

drivers/gpu/drm/i915/i915_gem_gtt.c

+19 −10
Original line number Diff line number Diff line
@@ -2912,7 +2912,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv) 
	mutex_unlock(&dev_priv->drm.struct_mutex);



	arch_phys_wc_del(ggtt->mtrr);

	io_mapping_fini(&ggtt->mappable);

	io_mapping_fini(&ggtt->iomap);

}



static unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)
@@ -3288,8 +3288,10 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) 
	int err;



	/* TODO: We're not aware of mappable constraints on gen8 yet */

	ggtt->mappable_base = pci_resource_start(pdev, 2);

	ggtt->mappable_end = pci_resource_len(pdev, 2);

	ggtt->gmadr =

		(struct resource) DEFINE_RES_MEM(pci_resource_start(pdev, 2),

						 pci_resource_len(pdev, 2));

	ggtt->mappable_end = resource_size(&ggtt->gmadr);



	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(39));

	if (!err)
@@ -3343,8 +3345,10 @@ static int gen6_gmch_probe(struct i915_ggtt *ggtt) 
	u16 snb_gmch_ctl;

	int err;



	ggtt->mappable_base = pci_resource_start(pdev, 2);

	ggtt->mappable_end = pci_resource_len(pdev, 2);

	ggtt->gmadr =

		(struct resource) DEFINE_RES_MEM(pci_resource_start(pdev, 2),

						 pci_resource_len(pdev, 2));

	ggtt->mappable_end = resource_size(&ggtt->gmadr);



	/* 64/512MB is the current min/max we actually know of, but this is just

	 * a coarse sanity check.
@@ -3397,6 +3401,7 @@ static void i915_gmch_remove(struct i915_address_space *vm) 
static int i915_gmch_probe(struct i915_ggtt *ggtt)

{

	struct drm_i915_private *dev_priv = ggtt->base.i915;

	phys_addr_t gmadr_base;

	int ret;



	ret = intel_gmch_probe(dev_priv->bridge_dev, dev_priv->drm.pdev, NULL);
@@ -3406,9 +3411,13 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) 
	}



	intel_gtt_get(&ggtt->base.total,

		      &ggtt->mappable_base,

		      &gmadr_base,

		      &ggtt->mappable_end);



	ggtt->gmadr =

		(struct resource) DEFINE_RES_MEM(gmadr_base,

						 ggtt->mappable_end);



	ggtt->do_idle_maps = needs_idle_maps(dev_priv);

	ggtt->base.insert_page = i915_ggtt_insert_page;

	ggtt->base.insert_entries = i915_ggtt_insert_entries;
@@ -3476,7 +3485,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv) 
	/* GMADR is the PCI mmio aperture into the global GTT. */

	DRM_INFO("Memory usable by graphics device = %lluM\n",

		 ggtt->base.total >> 20);

	DRM_DEBUG_DRIVER("GMADR size = %lldM\n", ggtt->mappable_end >> 20);

	DRM_DEBUG_DRIVER("GMADR size = %lluM\n", (u64)ggtt->mappable_end >> 20);

	DRM_DEBUG_DRIVER("GTT stolen size = %lluM\n",

			 (u64)resource_size(&intel_graphics_stolen_res) >> 20);

	if (intel_vtd_active())
@@ -3507,14 +3516,14 @@ int i915_ggtt_init_hw(struct drm_i915_private *dev_priv) 
		ggtt->base.mm.color_adjust = i915_gtt_color_adjust;

	mutex_unlock(&dev_priv->drm.struct_mutex);



	if (!io_mapping_init_wc(&dev_priv->ggtt.mappable,

				dev_priv->ggtt.mappable_base,

	if (!io_mapping_init_wc(&dev_priv->ggtt.iomap,

				dev_priv->ggtt.gmadr.start,

				dev_priv->ggtt.mappable_end)) {

		ret = -EIO;

		goto out_gtt_cleanup;

	}



	ggtt->mtrr = arch_phys_wc_add(ggtt->mappable_base, ggtt->mappable_end);

	ggtt->mtrr = arch_phys_wc_add(ggtt->gmadr.start, ggtt->mappable_end);



	/*

	 * Initialise stolen early so that we may reserve preallocated