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

Commit 82ad6443 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gtt: Rename i915_hw_ppgtt base member 



In the near future, I want to subclass gen6_hw_ppgtt as it contains a
few specialised members and I wish to add more. To avoid the ugliness of
using ppgtt->base.base, rename the i915_hw_ppgtt base member
(i915_address_space) as vm, which is our common shorthand for an
i915_address_space local.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180605153758.18422-1-chris@chris-wilson.co.uk
parent cd68e04c

drivers/gpu/drm/i915/gvt/aperture_gm.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int alloc_gm(struct intel_vgpu *vgpu, bool high_gm) 
	}



	mutex_lock(&dev_priv->drm.struct_mutex);

	ret = i915_gem_gtt_insert(&dev_priv->ggtt.base, node,

	ret = i915_gem_gtt_insert(&dev_priv->ggtt.vm, node,

				  size, I915_GTT_PAGE_SIZE,

				  I915_COLOR_UNEVICTABLE,

				  start, end, flags);

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

+2 −2
Original line number Diff line number Diff line
@@ -361,9 +361,9 @@ int intel_gvt_load_firmware(struct intel_gvt *gvt); 
#define gvt_aperture_sz(gvt)	  (gvt->dev_priv->ggtt.mappable_end)

#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_gm_sz(gvt)	  (gvt->dev_priv->ggtt.vm.total)

#define gvt_ggtt_sz(gvt) \

	((gvt->dev_priv->ggtt.base.total >> PAGE_SHIFT) << 3)

	((gvt->dev_priv->ggtt.vm.total >> PAGE_SHIFT) << 3)

#define gvt_hidden_sz(gvt)	  (gvt_ggtt_gm_sz(gvt) - gvt_aperture_sz(gvt))



#define gvt_aperture_gmadr_base(gvt) (0)

drivers/gpu/drm/i915/i915_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ static int per_file_stats(int id, void *ptr, void *data) 
		} else {

			struct i915_hw_ppgtt *ppgtt = i915_vm_to_ppgtt(vma->vm);



			if (ppgtt->base.file != stats->file_priv)

			if (ppgtt->vm.file != stats->file_priv)

				continue;

		}
@@ -508,7 +508,7 @@ static int i915_gem_object_info(struct seq_file *m, void *data) 
		   dpy_count, dpy_size);



	seq_printf(m, "%llu [%pa] gtt total\n",

		   ggtt->base.total, &ggtt->mappable_end);

		   ggtt->vm.total, &ggtt->mappable_end);

	seq_printf(m, "Supported page sizes: %s\n",

		   stringify_page_sizes(INTEL_INFO(dev_priv)->page_sizes,

					buf, sizeof(buf)));

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -3213,7 +3213,7 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev, 
static inline struct i915_hw_ppgtt *

i915_vm_to_ppgtt(struct i915_address_space *vm)

{

	return container_of(vm, struct i915_hw_ppgtt, base);

	return container_of(vm, struct i915_hw_ppgtt, vm);

}



/* i915_gem_fence_reg.c */

drivers/gpu/drm/i915/i915_gem.c

+14 −16
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ insert_mappable_node(struct i915_ggtt *ggtt, 
                     struct drm_mm_node *node, u32 size)

{

	memset(node, 0, sizeof(*node));

	return drm_mm_insert_node_in_range(&ggtt->base.mm, node,

	return drm_mm_insert_node_in_range(&ggtt->vm.mm, node,

					   size, 0, I915_COLOR_UNEVICTABLE,

					   0, ggtt->mappable_end,

					   DRM_MM_INSERT_LOW);
@@ -249,17 +249,17 @@ i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, 
	struct i915_vma *vma;

	u64 pinned;



	pinned = ggtt->base.reserved;

	pinned = ggtt->vm.reserved;

	mutex_lock(&dev->struct_mutex);

	list_for_each_entry(vma, &ggtt->base.active_list, vm_link)

	list_for_each_entry(vma, &ggtt->vm.active_list, vm_link)

		if (i915_vma_is_pinned(vma))

			pinned += vma->node.size;

	list_for_each_entry(vma, &ggtt->base.inactive_list, vm_link)

	list_for_each_entry(vma, &ggtt->vm.inactive_list, vm_link)

		if (i915_vma_is_pinned(vma))

			pinned += vma->node.size;

	mutex_unlock(&dev->struct_mutex);



	args->aper_size = ggtt->base.total;

	args->aper_size = ggtt->vm.total;

	args->aper_available_size = args->aper_size - pinned;



	return 0;
@@ -1223,7 +1223,7 @@ i915_gem_gtt_pread(struct drm_i915_gem_object *obj, 
		page_length = remain < page_length ? remain : page_length;

		if (node.allocated) {

			wmb();

			ggtt->base.insert_page(&ggtt->base,

			ggtt->vm.insert_page(&ggtt->vm,

					     i915_gem_object_get_dma_address(obj, offset >> PAGE_SHIFT),

					     node.start, I915_CACHE_NONE, 0);

			wmb();
@@ -1246,8 +1246,7 @@ i915_gem_gtt_pread(struct drm_i915_gem_object *obj, 
out_unpin:

	if (node.allocated) {

		wmb();

		ggtt->base.clear_range(&ggtt->base,

				       node.start, node.size);

		ggtt->vm.clear_range(&ggtt->vm, node.start, node.size);

		remove_mappable_node(&node);

	} else {

		i915_vma_unpin(vma);
@@ -1426,7 +1425,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj, 
		page_length = remain < page_length ? remain : page_length;

		if (node.allocated) {

			wmb(); /* flush the write before we modify the GGTT */

			ggtt->base.insert_page(&ggtt->base,

			ggtt->vm.insert_page(&ggtt->vm,

					     i915_gem_object_get_dma_address(obj, offset >> PAGE_SHIFT),

					     node.start, I915_CACHE_NONE, 0);

			wmb(); /* flush modifications to the GGTT (insert_page) */
@@ -1455,8 +1454,7 @@ i915_gem_gtt_pwrite_fast(struct drm_i915_gem_object *obj, 
out_unpin:

	if (node.allocated) {

		wmb();

		ggtt->base.clear_range(&ggtt->base,

				       node.start, node.size);

		ggtt->vm.clear_range(&ggtt->vm, node.start, node.size);

		remove_mappable_node(&node);

	} else {

		i915_vma_unpin(vma);
@@ -4374,7 +4372,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, 
			 u64 flags)

{

	struct drm_i915_private *dev_priv = to_i915(obj->base.dev);

	struct i915_address_space *vm = &dev_priv->ggtt.base;

	struct i915_address_space *vm = &dev_priv->ggtt.vm;

	struct i915_vma *vma;

	int ret;