Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220318233938.149744-2-andi.shyti@linux.intel.com

authored by

Andi Shyti and committed by
Matthew Auld
fa732088 6f270e14

+16 -16
+1 -1
drivers/gpu/drm/i915/display/intel_fb.c
··· 1981 1981 1982 1982 /* object is backed with LMEM for discrete */ 1983 1983 i915 = to_i915(obj->base.dev); 1984 - if (HAS_LMEM(i915) && !i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM)) { 1984 + if (HAS_LMEM(i915) && !i915_gem_object_can_migrate(obj, INTEL_REGION_LMEM_0)) { 1985 1985 /* object is "remote", not in local memory */ 1986 1986 i915_gem_object_put(obj); 1987 1987 return ERR_PTR(-EREMOTE);
+1 -1
drivers/gpu/drm/i915/display/intel_fb_pin.c
··· 140 140 if (!ret && phys_cursor) 141 141 ret = i915_gem_object_attach_phys(obj, alignment); 142 142 else if (!ret && HAS_LMEM(dev_priv)) 143 - ret = i915_gem_object_migrate(obj, &ww, INTEL_REGION_LMEM); 143 + ret = i915_gem_object_migrate(obj, &ww, INTEL_REGION_LMEM_0); 144 144 /* TODO: Do we need to sync when migration becomes async? */ 145 145 if (!ret) 146 146 ret = i915_gem_object_pin_pages(obj);
+1 -1
drivers/gpu/drm/i915/display/intel_plane_initial.c
··· 72 72 } 73 73 74 74 phys_base = pte & I915_GTT_PAGE_MASK; 75 - mem = i915->mm.regions[INTEL_REGION_LMEM]; 75 + mem = i915->mm.regions[INTEL_REGION_LMEM_0]; 76 76 77 77 /* 78 78 * We don't currently expect this to ever be placed in the
+2 -2
drivers/gpu/drm/i915/gem/i915_gem_lmem.c
··· 100 100 resource_size_t page_size, 101 101 unsigned int flags) 102 102 { 103 - return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM], 103 + return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM_0], 104 104 size, page_size, flags); 105 105 } 106 106 ··· 135 135 resource_size_t size, 136 136 unsigned int flags) 137 137 { 138 - return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM], 138 + return i915_gem_object_create_region(i915->mm.regions[INTEL_REGION_LMEM_0], 139 139 size, 0, flags); 140 140 }
+3 -3
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
··· 88 88 static int igt_dmabuf_import_same_driver_lmem(void *arg) 89 89 { 90 90 struct drm_i915_private *i915 = arg; 91 - struct intel_memory_region *lmem = i915->mm.regions[INTEL_REGION_LMEM]; 91 + struct intel_memory_region *lmem = i915->mm.regions[INTEL_REGION_LMEM_0]; 92 92 struct drm_i915_gem_object *obj; 93 93 struct drm_gem_object *import; 94 94 struct dma_buf *dmabuf; ··· 252 252 struct drm_i915_private *i915 = arg; 253 253 struct intel_memory_region *regions[2]; 254 254 255 - if (!i915->mm.regions[INTEL_REGION_LMEM]) 255 + if (!i915->mm.regions[INTEL_REGION_LMEM_0]) 256 256 return 0; 257 257 258 - regions[0] = i915->mm.regions[INTEL_REGION_LMEM]; 258 + regions[0] = i915->mm.regions[INTEL_REGION_LMEM_0]; 259 259 regions[1] = i915->mm.regions[INTEL_REGION_SMEM]; 260 260 return igt_dmabuf_import_same_driver(i915, regions, 2); 261 261 }
+4 -4
drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
··· 92 92 93 93 static int igt_smem_create_migrate(void *arg) 94 94 { 95 - return igt_create_migrate(arg, INTEL_REGION_LMEM, INTEL_REGION_SMEM); 95 + return igt_create_migrate(arg, INTEL_REGION_LMEM_0, INTEL_REGION_SMEM); 96 96 } 97 97 98 98 static int igt_lmem_create_migrate(void *arg) 99 99 { 100 - return igt_create_migrate(arg, INTEL_REGION_SMEM, INTEL_REGION_LMEM); 100 + return igt_create_migrate(arg, INTEL_REGION_SMEM, INTEL_REGION_LMEM_0); 101 101 } 102 102 103 103 static int igt_same_create_migrate(void *arg) 104 104 { 105 - return igt_create_migrate(arg, INTEL_REGION_LMEM, INTEL_REGION_LMEM); 105 + return igt_create_migrate(arg, INTEL_REGION_LMEM_0, INTEL_REGION_LMEM_0); 106 106 } 107 107 108 108 static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww, ··· 152 152 } 153 153 154 154 } else { 155 - err = i915_gem_object_migrate(obj, ww, INTEL_REGION_LMEM); 155 + err = i915_gem_object_migrate(obj, ww, INTEL_REGION_LMEM_0); 156 156 if (err) { 157 157 pr_err("Object failed migration to lmem\n"); 158 158 if (err)
+1 -1
drivers/gpu/drm/i915/gt/intel_gt.c
··· 76 76 return err; 77 77 } 78 78 79 - id = INTEL_REGION_LMEM; 79 + id = INTEL_REGION_LMEM_0; 80 80 81 81 mem->id = id; 82 82
+1 -1
drivers/gpu/drm/i915/intel_memory_region.c
··· 17 17 .class = INTEL_MEMORY_SYSTEM, 18 18 .instance = 0, 19 19 }, 20 - [INTEL_REGION_LMEM] = { 20 + [INTEL_REGION_LMEM_0] = { 21 21 .class = INTEL_MEMORY_LOCAL, 22 22 .instance = 0, 23 23 },
+2 -2
drivers/gpu/drm/i915/intel_memory_region.h
··· 29 29 30 30 enum intel_region_id { 31 31 INTEL_REGION_SMEM = 0, 32 - INTEL_REGION_LMEM, 32 + INTEL_REGION_LMEM_0, 33 33 INTEL_REGION_STOLEN_SMEM, 34 34 INTEL_REGION_STOLEN_LMEM, 35 35 INTEL_REGION_UNKNOWN, /* Should be last */ 36 36 }; 37 37 38 38 #define REGION_SMEM BIT(INTEL_REGION_SMEM) 39 - #define REGION_LMEM BIT(INTEL_REGION_LMEM) 39 + #define REGION_LMEM BIT(INTEL_REGION_LMEM_0) 40 40 #define REGION_STOLEN_SMEM BIT(INTEL_REGION_STOLEN_SMEM) 41 41 #define REGION_STOLEN_LMEM BIT(INTEL_REGION_STOLEN_LMEM) 42 42