Commit fa732088 authored by Andi Shyti's avatar Andi Shyti Committed by Matthew Auld
Browse files

drm/i915: Rename INTEL_REGION_LMEM with INTEL_REGION_LMEM_0 



With the upcoming multitile support each tile will have its own
local memory. Mark the current LMEM with the suffix '0' to
emphasise that it belongs to the root tile.

Suggested-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220318233938.149744-2-andi.shyti@linux.intel.com
parent 6f270e14

drivers/gpu/drm/i915/display/intel_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -1981,7 +1981,7 @@ intel_user_framebuffer_create(struct drm_device *dev, 


	/* object is backed with LMEM for discrete */

	i915 = to_i915(obj->base.dev);

	if (HAS_LMEM(i915) && !i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM)) {

	if (HAS_LMEM(i915) && !i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM_0)) {

		/* object is "remote", not in local memory */

		i915_gem_object_put(obj);

		return ERR_PTR(-EREMOTE);

drivers/gpu/drm/i915/display/intel_fb_pin.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb, 
	if (!ret && phys_cursor)

		ret = i915_gem_object_attach_phys(obj, alignment);

	else if (!ret && HAS_LMEM(dev_priv))

		ret = i915_gem_object_migrate(obj, &ww, INTEL_REGION_LMEM);

		ret = i915_gem_object_migrate(obj, &ww, INTEL_REGION_LMEM_0);

	/* TODO: Do we need to sync when migration becomes async? */

	if (!ret)

		ret = i915_gem_object_pin_pages(obj);

drivers/gpu/drm/i915/display/intel_plane_initial.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ initial_plane_vma(struct drm_i915_private *i915, 
		}



		phys_base = pte & I915_GTT_PAGE_MASK;

		mem = i915->mm.regions[INTEL_REGION_LMEM];

		mem = i915->mm.regions[INTEL_REGION_LMEM_0];



		/*

		 * We don't currently expect this to ever be placed in the

drivers/gpu/drm/i915/gem/i915_gem_lmem.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ __i915_gem_object_create_lmem_with_ps(struct drm_i915_private *i915, 
				      resource_size_t page_size,

				      unsigned int flags)

{

	return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM],

	return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM_0],

					     size, page_size, flags);

}
@@ -135,6 +135,6 @@ i915_gem_object_create_lmem(struct drm_i915_private *i915, 
			    resource_size_t size,

			    unsigned int flags)

{

	return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM],

	return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM_0],

					     size, 0, flags);

}

drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int igt_dmabuf_import_self(void *arg) 
static int igt_dmabuf_import_same_driver_lmem(void *arg)

{

	struct drm_i915_private *i915 = arg;

	struct intel_memory_region *lmem = i915->mm.regions[INTEL_REGION_LMEM];

	struct intel_memory_region *lmem = i915->mm.regions[INTEL_REGION_LMEM_0];

	struct drm_i915_gem_object *obj;

	struct drm_gem_object *import;

	struct dma_buf *dmabuf;
@@ -252,10 +252,10 @@ static int igt_dmabuf_import_same_driver_lmem_smem(void *arg) 
	struct drm_i915_private *i915 = arg;

	struct intel_memory_region *regions[2];



	if (!i915->mm.regions[INTEL_REGION_LMEM])

	if (!i915->mm.regions[INTEL_REGION_LMEM_0])

		return 0;



	regions[0] = i915->mm.regions[INTEL_REGION_LMEM];

	regions[0] = i915->mm.regions[INTEL_REGION_LMEM_0];

	regions[1] = i915->mm.regions[INTEL_REGION_SMEM];

	return igt_dmabuf_import_same_driver(i915, regions, 2);

}