On 17.02.2022 15:41, Andi Shyti wrote:
> 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@xxxxxxxxx>
> Signed-off-by: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_fb.c | 2 +-
> drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +-
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 4 ++--
> drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 6 +++---
> drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 8 ++++----
> drivers/gpu/drm/i915/gt/intel_gt.c | 2 +-
> drivers/gpu/drm/i915/intel_memory_region.c | 2 +-
> drivers/gpu/drm/i915/intel_memory_region.h | 4 ++--
> 8 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> index 23cfe2e5ce2a..421f7238da05 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> index a307b4993bcf..bd6e7c98e751 100644
> --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
> +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 444f8268b9c5..47e43dc3a174 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -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);
> }
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> index b071a58dd6da..a342fd387d4e 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
> @@ -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);
> }
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
> index d534141b2cf7..2c63daf932de 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
> @@ -92,17 +92,17 @@ static int igt_create_migrate(struct intel_gt *gt, enum intel_region_id src,
>
> static int igt_smem_create_migrate(void *arg)
> {
> - return igt_create_migrate(arg, INTEL_REGION_LMEM, INTEL_REGION_SMEM);
> + return igt_create_migrate(arg, INTEL_REGION_LMEM_0, INTEL_REGION_SMEM);
> }
>
> static int igt_lmem_create_migrate(void *arg)
> {
> - return igt_create_migrate(arg, INTEL_REGION_SMEM, INTEL_REGION_LMEM);
> + return igt_create_migrate(arg, INTEL_REGION_SMEM, INTEL_REGION_LMEM_0);
> }
>
> static int igt_same_create_migrate(void *arg)
> {
> - return igt_create_migrate(arg, INTEL_REGION_LMEM, INTEL_REGION_LMEM);
> + return igt_create_migrate(arg, INTEL_REGION_LMEM_0, INTEL_REGION_LMEM_0);
> }
>
> static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww,
> @@ -152,7 +152,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww,
> }
>
> } else {
> - err = i915_gem_object_migrate(obj, ww, INTEL_REGION_LMEM);
> + err = i915_gem_object_migrate(obj, ww, INTEL_REGION_LMEM_0);
> if (err) {
> pr_err("Object failed migration to lmem\n");
> if (err)
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
> index e8403fa53909..db171e85f4df 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> @@ -78,7 +78,7 @@ int intel_gt_probe_lmem(struct intel_gt *gt)
> return err;
> }
>
> - id = INTEL_REGION_LMEM;
> + id = INTEL_REGION_LMEM_0;
>
> mem->id = id;
>
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
> index c70d7e286a51..18d7f0aa314e 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.c
> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
> @@ -17,7 +17,7 @@ static const struct {
> .class = INTEL_MEMORY_SYSTEM,
> .instance = 0,
> },
> - [INTEL_REGION_LMEM] = {
> + [INTEL_REGION_LMEM_0] = {
> .class = INTEL_MEMORY_LOCAL,
> .instance = 0,
> },
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
> index 5625c9c38993..95db0a8029e2 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.h
> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
> @@ -29,14 +29,14 @@ enum intel_memory_type {
>
> enum intel_region_id {
> INTEL_REGION_SMEM = 0,
> - INTEL_REGION_LMEM,
> + INTEL_REGION_LMEM_0,
wasn't sure how big this change will be, but after looking at next
patch, it was worth doing that, so
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
> INTEL_REGION_STOLEN_SMEM,
> INTEL_REGION_STOLEN_LMEM,
> INTEL_REGION_UNKNOWN, /* Should be last */
> };
>
> #define REGION_SMEM BIT(INTEL_REGION_SMEM)
> -#define REGION_LMEM BIT(INTEL_REGION_LMEM)
> +#define REGION_LMEM BIT(INTEL_REGION_LMEM_0)
> #define REGION_STOLEN_SMEM BIT(INTEL_REGION_STOLEN_SMEM)
> #define REGION_STOLEN_LMEM BIT(INTEL_REGION_STOLEN_LMEM)
>
