drm/i915: Create dumb buffer from LMEM
Subsystems (4)
PATCH 1/3 drm/i915: Create dumb buffer from LMEM
When LMEM is supported, dumb buffer preferred to be created from LMEM.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/.
v2:
Parameters are reshuffled. [Chris]
--- drivers/gpu/drm/i915/i915_gem.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +15 -3
@@ -44,6 +44,7 @@#include "gem/i915_gem_clflush.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" +#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_pm.h" #include "gt/intel_engine_user.h" #include "gt/intel_gt.h"
@@ -160,6 +161,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,static int i915_gem_create (struct drm_file *file,struct drm_i915_private *dev_priv, +enum intel_region_id mem_region,u64 *size_p,u32 *handle_p) {
@@ -173,7 +175,12 @@ i915_gem_create(struct drm_file *file,return -EINVAL ;/* Allocate the new object */ - obj =i915_gem_object_create_shmem (dev_priv, size); +if (mem_region ==INTEL_MEMORY_LMEM ) + obj =i915_gem_object_create_lmem (dev_priv, size,0 ); +else if (mem_region ==INTEL_MEMORY_STOLEN ) + obj =i915_gem_object_create_stolen (dev_priv, size); +else + obj =i915_gem_object_create_shmem (dev_priv, size);if (IS_ERR (obj))return PTR_ERR (obj);
@@ -193,6 +200,7 @@ i915_gem_dumb_create(struct drm_file *file,struct drm_device *dev, struct drm_mode_create_dumb *args) { + enum intel_region_id mem_region = INTEL_MEMORY_UKNOWN;int cpp =DIV_ROUND_UP (args->bpp,8 );u32 format;
@@ -219,7 +227,11 @@ i915_gem_dumb_create(struct drm_file *file, args->pitch =ALIGN (args->pitch,4096 ); args->size = args->pitch * args->height; -return i915_gem_create (file,to_i915 (dev), + +if (HAS_LMEM (to_i915 (dev))) + mem_region =INTEL_MEMORY_LMEM ; + +return i915_gem_create (file,to_i915 (dev), mem_region, &args->size, &args->handle); }
@@ -238,7 +250,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,i915_gem_flush_free_objects (dev_priv); -return i915_gem_create (file, dev_priv, +return i915_gem_create (file, dev_priv,INTEL_MEMORY_UKNOWN , &args->size, &args->handle); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: Allowed memory region for GEM obj
Each GEM object is initialized with allowed memory regions for it's migration across memory region.
In future patch we are restricting the memory regions or few objects.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 8 ++++++++ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +++ drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c | 2 +- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++--- drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- drivers/gpu/drm/i915/intel_region_lmem.c | 2 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/selftests/mock_region.c | 2 +- 13 files changed, 24 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +1 -1
@@ -287,7 +287,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, }drm_gem_private_object_init (dev, &obj->base, dma_buf->size); -i915_gem_object_init (obj, &i915_gem_object_dmabuf_ops); +i915_gem_object_init (obj,to_i915 (dev), &i915_gem_object_dmabuf_ops); obj->base.import_attach = attach; obj->base.resv = dma_buf->resv;
drivers/gpu/drm/i915/gem/i915_gem_internal.c +1 -1
@@ -180,7 +180,7 @@ i915_gem_object_create_internal(struct drm_i915_private *i915,return ERR_PTR (-ENOMEM );drm_gem_private_object_init (&i915->drm, &obj->base, size); -i915_gem_object_init (obj, &i915_gem_object_internal_ops); +i915_gem_object_init (obj, i915, &i915_gem_object_internal_ops);/* * Mark the object as volatile, such that the pages are marked as
drivers/gpu/drm/i915/gem/i915_gem_object.c +8 -0
@@ -49,6 +49,7 @@ void i915_gem_object_free(struct drm_i915_gem_object *obj) }void i915_gem_object_init (struct drm_i915_gem_object *obj, +struct drm_i915_private *dev_priv,const struct drm_i915_gem_object_ops *ops) {mutex_init (&obj->mm.lock);
@@ -70,6 +71,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, obj->mm.madv =I915_MADV_WILLNEED ;INIT_RADIX_TREE (&obj->mm.get_page.radix,GFP_KERNEL | __GFP_NOWARN);mutex_init (&obj->mm.get_page.lock); + + obj->memory_regions =INTEL_INFO (i915)->memory_regions; }/**
@@ -534,6 +537,11 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv,u32 region = uregions_copy[i];enum intel_region_id id =__region_id (region); +if (!(obj->memory_region & region)) { + ret = -EINVAL ; +continue ; + } +if (id ==INTEL_MEMORY_UKNOWN ) { ret = -EINVAL ; goto err;
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +3 -0
@@ -286,6 +286,9 @@ struct drm_i915_gem_object {/** for phys allocated objects */ struct drm_dma_handle *phys_handle; + +/* Allowed memory regions for this obj to reside in. */ +u32 memory_regions; }; static inline struct drm_i915_gem_object *
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +1 -1
@@ -492,7 +492,7 @@ create_shmem(struct intel_memory_region *mem,mapping_set_gfp_mask (mapping, mask);GEM_BUG_ON (!(mapping_gfp_mask (mapping) & __GFP_RECLAIM)); -i915_gem_object_init (obj, &i915_gem_shmem_ops); +i915_gem_object_init (obj, i915, &i915_gem_shmem_ops); obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ;
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +1 -1
@@ -564,7 +564,7 @@ __i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,return NULL ;drm_gem_private_object_init (&dev_priv->drm, &obj->base, stolen->size); -i915_gem_object_init (obj, &i915_gem_object_stolen_ops); +i915_gem_object_init (obj, dev_priv, &i915_gem_object_stolen_ops); obj->stolen = stolen; obj->read_domains =I915_GEM_DOMAIN_CPU |I915_GEM_DOMAIN_GTT ;
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +1 -1
@@ -792,7 +792,7 @@ i915_gem_userptr_ioctl(struct drm_device *dev,return -ENOMEM ;drm_gem_private_object_init (dev, &obj->base, args->user_size); -i915_gem_object_init (obj, &i915_gem_userptr_ops); +i915_gem_object_init (obj, dev_priv, &i915_gem_userptr_ops); obj->read_domains =I915_GEM_DOMAIN_CPU ; obj->write_domain =I915_GEM_DOMAIN_CPU ;i915_gem_object_set_cache_coherency (obj,I915_CACHE_LLC );
drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c +1 -1
@@ -113,7 +113,7 @@ huge_gem_object(struct drm_i915_private *i915,return ERR_PTR (-ENOMEM );drm_gem_private_object_init (&i915->drm, &obj->base, dma_size); -i915_gem_object_init (obj, &huge_ops); +i915_gem_object_init (obj, i915, &huge_ops); obj->read_domains =I915_GEM_DOMAIN_CPU ; obj->write_domain =I915_GEM_DOMAIN_CPU ;
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +3 -3
@@ -166,7 +166,7 @@ huge_pages_object(struct drm_i915_private *i915,return ERR_PTR (-ENOMEM );drm_gem_private_object_init (&i915->drm, &obj->base, size); -i915_gem_object_init (obj, &huge_page_ops); +i915_gem_object_init (obj, i915, &huge_page_ops); obj->flags =I915_BO_ALLOC_VOLATILE ;
@@ -314,9 +314,9 @@ fake_huge_pages_object(struct drm_i915_private *i915, u64 size, bool single)drm_gem_private_object_init (&i915->drm, &obj->base, size);if (single) -i915_gem_object_init (obj, &fake_ops_single); +i915_gem_object_init (obj, i915, &fake_ops_single);else -i915_gem_object_init (obj, &fake_ops); +i915_gem_object_init (obj, i915, &fake_ops); obj->flags =I915_BO_ALLOC_VOLATILE ;
drivers/gpu/drm/i915/gvt/dmabuf.c +1 -1
@@ -161,7 +161,7 @@ static struct drm_i915_gem_object *vgpu_create_gem(struct drm_device *dev,drm_gem_private_object_init (dev, &obj->base,roundup (info->size,PAGE_SIZE )); -i915_gem_object_init (obj, &intel_vgpu_gem_ops); +i915_gem_object_init (obj, dev_priv, &intel_vgpu_gem_ops); obj->read_domains =I915_GEM_DOMAIN_GTT ; obj->write_domain =0 ;
drivers/gpu/drm/i915/intel_region_lmem.c +1 -1
@@ -29,7 +29,7 @@ lmem_create_object(struct intel_memory_region *mem,return ERR_PTR (-ENOMEM );drm_gem_private_object_init (&i915->drm, &obj->base, size); -i915_gem_object_init (obj, &i915_gem_lmem_obj_ops); +i915_gem_object_init (obj, i915, &i915_gem_lmem_obj_ops); obj->read_domains =I915_GEM_DOMAIN_CPU |I915_GEM_DOMAIN_GTT ;
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
@@ -123,7 +123,7 @@ fake_dma_object(struct drm_i915_private *i915, u64 size) goto err;drm_gem_private_object_init (&i915->drm, &obj->base, size); -i915_gem_object_init (obj, &fake_ops); +i915_gem_object_init (obj, i915, &fake_ops); obj->flags =I915_BO_ALLOC_VOLATILE ;
drivers/gpu/drm/i915/selftests/mock_region.c +1 -1
@@ -34,7 +34,7 @@ mock_object_create(struct intel_memory_region *mem,return ERR_PTR (-ENOMEM );drm_gem_private_object_init (&i915->drm, &obj->base, size); -i915_gem_object_init (obj, &mock_region_obj_ops); +i915_gem_object_init (obj, i915, &mock_region_obj_ops); obj->read_domains =I915_GEM_DOMAIN_CPU |I915_GEM_DOMAIN_GTT ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915: Allowed memory region for GEM obj
Quoting Ramalingam C (2019-09-26 06:21:34)
drivers/gpu/drm/i915/gem/i915_gem_object.c void i915_gem_object_free(struct drm_i915_gem_object *obj) · line 52
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +1
-0@@ -49,6 +49,7 @@ void i915_gem_object_free(struct drm_i915_gem_object *obj) } void i915_gem_object_init(struct drm_i915_gem_object *obj, + struct drm_i915_private *dev_priv,
to_i915(obj) is valid at this point.
Please never add dev_priv.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/3 drm/i915: Allowed memory region for GEM obj
In reply to Ramalingam CEach GEM object is initialized with allowed memory regions for it's migration across memory region.
In future patch we are restricting the memory regions or few objects.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/
v2:
dev_priv is retrieved from obj [Chris]
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 9 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +++ 2 files changed, 12 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_object.c +9 -0
@@ -51,6 +51,8 @@ void i915_gem_object_free(struct drm_i915_gem_object *obj)void i915_gem_object_init (struct drm_i915_gem_object *obj,const struct drm_i915_gem_object_ops *ops) { +struct drm_i915_file_private *dev_priv =to_i915 (obj->base.drm); +mutex_init (&obj->mm.lock);spin_lock_init (&obj->vma.lock);
@@ -70,6 +72,8 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, obj->mm.madv =I915_MADV_WILLNEED ;INIT_RADIX_TREE (&obj->mm.get_page.radix,GFP_KERNEL | __GFP_NOWARN);mutex_init (&obj->mm.get_page.lock); + + obj->memory_regions =INTEL_INFO (dev_priv)->memory_regions; }/**
@@ -534,6 +538,11 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv,u32 region = uregions_copy[i];enum intel_region_id id =__region_id (region); +if (!(obj->memory_regions & region)) { + ret = -EINVAL ; +continue ; + } +if (id ==INTEL_MEMORY_UKNOWN ) { ret = -EINVAL ; goto err;
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +3 -0
@@ -286,6 +286,9 @@ struct drm_i915_gem_object {/** for phys allocated objects */ struct drm_dma_handle *phys_handle; + +/* Allowed memory regions for this obj to reside in. */ +u32 memory_regions; }; static inline struct drm_i915_gem_object *
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: FB backing gem obj should reside in LMEM
In reply to Ramalingam CIf Local memory is supported by hardware, we want framebuffer backing gem objects out of local memory.
If local memory is supported and gem object if not from local memory we migrate the obj into local memory. And once framebuffer is created we block the migration of the associated object out of local memory.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/
--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 58 ++++++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 + 3 files changed, 62 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +25 -0
@@ -56,6 +56,8 @@#include "display/intel_tv.h" #include "display/intel_vdsc.h" +#include "gem/i915_gem_object.h" +#include "i915_drv.h" #include "i915_trace.h" #include "intel_acpi.h"
@@ -15496,6 +15498,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb) {struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb); +struct drm_i915_private *dev_priv =to_i915 (fb->dev); + +/* removing the FB memory region restriction on obj, if any */ + intel_fb->front_buffer->obj =INTEL_INFO (dev_priv)->memory_regions;drm_framebuffer_cleanup (fb);intel_frontbuffer_put (intel_fb->frontbuffer);
@@ -15543,11 +15549,26 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, {struct drm_i915_private *dev_priv =to_i915 (obj->base.dev);struct drm_framebuffer *fb = &intel_fb->base; +u32 *region_map;u32 max_stride;unsigned int tiling, stride;int ret = -EINVAL ;int i; +/* GEM Obj for frame buffer is expected to be in LMEM. */ +if (HAS_LMEM (dev_priv)) +if (obj->mm.region->type !=INTEL_LMEM ) { + region_map = &intel_region_map[INTEL_MEMORY_LMEM ]; + ret =i915_gem_object_mem_region_migrate (dev_priv, obj, + region_map, +1 ); +if (ret) { +DRM_ERROR ("FB migration to LMEM Failed(%d)\n" , + ret); +return ret; + } + } + intel_fb->frontbuffer =intel_frontbuffer_get (obj);if (!intel_fb->frontbuffer)return -ENOMEM ;
@@ -15666,6 +15687,10 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; } +/* Blocking the migration of gem obj out of LMEM */ +if (HAS_LMEM (dev_priv)) + obj->memory_regions =REGION_LMEM ; +return 0 ; err:
drivers/gpu/drm/i915/gem/i915_gem_object.c +34 -24
78 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_object.h +3 -0
@@ -47,6 +47,9 @@ int i915_gem_object_migrate(struct drm_i915_gem_object *obj, enum intel_region_id id);void i915_gem_flush_free_objects (struct drm_i915_private *i915); +int i915_gem_object_mem_region_migrate (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count);void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: FB backing gem obj should reside in LMEM
Quoted 32 lines · Ramalingam C
If Local memory is supported by hardware, we want framebuffer backing gem objects out of local memory.
If local memory is supported and gem object if not from local memory we migrate the obj into local memory. And once framebuffer is created we block the migration of the associated object out of local memory.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/cc Matthew Auld <[email protected]>Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 58 ++++++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 + 3 files changed, 62 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -56,6 +56,8 @@#include "display/intel_tv.h" #include "display/intel_vdsc.h" +#include "gem/i915_gem_object.h" +#include "i915_drv.h" #include "i915_trace.h" #include "intel_acpi.h"
drivers/gpu/drm/i915/display/intel_display.c static void intel_setup_outputs(struct drm_i915_private *dev_priv) · line 15504
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0@@ -15496,6 +15498,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb) {struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb); +struct drm_i915_private *dev_priv =to_i915 (fb->dev); + +/* removing the FB memory region restriction on obj, if any */ + intel_fb->front_buffer->obj =INTEL_INFO (dev_priv)->memory_regions;
Is this right, assigning bitmask to something called obj?
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0drm_framebuffer_cleanup (fb);intel_frontbuffer_put (intel_fb->frontbuffer);@@ -15543,11 +15549,26 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, {struct drm_i915_private *dev_priv =to_i915 (obj->base.dev);struct drm_framebuffer *fb = &intel_fb->base; +u32 *region_map;u32 max_stride;unsigned int tiling, stride;int ret = -EINVAL ;int i;
drivers/gpu/drm/i915/display/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 15567
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+/* GEM Obj for frame buffer is expected to be in LMEM. */ +if (HAS_LMEM (dev_priv)) +if (obj->mm.region->type !=INTEL_LMEM ) { + region_map = &intel_region_map[INTEL_MEMORY_LMEM ]; + ret =i915_gem_object_mem_region_migrate (dev_priv, obj, + region_map, +1 ); +if (ret) { +DRM_ERROR ("FB migration to LMEM Failed(%d)\n" , + ret);
Probably should be just debug level since it is imaginably user triggerable and not really an error for the kernel as such.
Quoted 85 lines
drivers/gpu/drm/i915/display/intel_display.c +8
-0+return ret; + } + } + intel_fb->frontbuffer =intel_frontbuffer_get (obj);if (!intel_fb->frontbuffer)return -ENOMEM ;@@ -15666,6 +15687,10 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; } +/* Blocking the migration of gem obj out of LMEM */ +if (HAS_LMEM (dev_priv)) + obj->memory_regions =REGION_LMEM ; +return 0 ; err:drivers/gpu/drm/i915/gem/i915_gem_object.c +19
-24@@ -501,30 +501,11 @@ __region_id(u32 region)return INTEL_MEMORY_UKNOWN ; } -static int i915_gem_object_region_select (struct drm_i915_private *dev_priv, -struct drm_i915_gem_object_param *args, -struct drm_file *file, -struct drm_i915_gem_object *obj) +int i915_gem_object_mem_region_migrate (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count) {struct intel_context *ce = dev_priv->engine[BCS0 ]->kernel_context; -u32 __user *uregions =u64_to_user_ptr (args->data); -u32 uregions_copy[INTEL_MEMORY_UKNOWN ]; -int i, ret; - -if (args->size >INTEL_MEMORY_UKNOWN ) -return -EINVAL ; - -memset (uregions_copy,0 ,sizeof (uregions_copy)); -for (i =0 ; i < args->size; i++) { -u32 region; - - ret =get_user (region, uregions); -if (ret) -return ret; - - uregions_copy[i] = region; - ++uregions; - }mutex_lock (&dev_priv->drm.struct_mutex); ret =i915_gem_object_prepare_move (obj);@@ -533,8 +514,8 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv, goto err; } -for (i =0 ; i < args->size; i++) { -u32 region = uregions_copy[i]; +for (i =0 ; i < region_count; i++) { +u32 region = uregions[i];enum intel_region_id id =__region_id (region);if (!(obj->memory_region & region)) {@@ -576,6 +557,35 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv,return ret; } +static int i915_gem_object_region_select (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object_param *args, +struct drm_file *file, +struct drm_i915_gem_object *obj) +{ +struct intel_context *ce = dev_priv->engine[BCS0 ]->kernel_context; +u32 __user *uregions =u64_to_user_ptr (args->data); +u32 uregions_copy[INTEL_MEMORY_UKNOWN ]; +int i, ret; + +if (args->size >INTEL_MEMORY_UKNOWN ) +return -EINVAL ; + +memset (uregions_copy,0 ,sizeof (uregions_copy));
drivers/gpu/drm/i915/gem/i915_gem_object.c static int i915_gem_object_region_select(struct drm_i915_private *dev_priv, · line 583
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +10
-0+for (i =0 ; i < args->size; i++) { +u32 region; + + ret =get_user (region, uregions); +if (ret) +return ret; + + uregions_copy[i] = region; + ++uregions; + }
I do understand this is old code (not yours) but I fail to penetrate why is this a loop and not copy_from_user?
Quoted 14 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +5
-0+ +return i915_gem_object_mem_region_migrate (dev_priv, obj, uregions_copy, + args->size); +} +int i915_gem_object_setparam_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {drivers/gpu/drm/i915/gem/i915_gem_object.h +0
-0
drivers/gpu/drm/i915/gem/i915_gem_object.h int i915_gem_object_migrate(struct drm_i915_gem_object *obj, · line 55
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_object.h +3
-0@@ -47,6 +47,9 @@ int i915_gem_object_migrate(struct drm_i915_gem_object *obj, enum intel_region_id id);void i915_gem_flush_free_objects (struct drm_i915_private *i915); +int i915_gem_object_mem_region_migrate (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count);void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj);
General approach looks feasible to me, but I'll leave guys directly involved with local memory to call it.
Another my comment/question would be - do we have a hook when objects are released/disassociated from the framebuffer and should we restore the allowed memory region mask to default at that point?
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: FB backing gem obj should reside in LMEM
Quoting Tvrtko Ursulin (2019-09-26 09:53:03)
Quoted 57 lines · Ramalingam C
Quoted 32 lines
If Local memory is supported by hardware, we want framebuffer backing gem objects out of local memory.
If local memory is supported and gem object if not from local memory we migrate the obj into local memory. And once framebuffer is created we block the migration of the associated object out of local memory.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/cc Matthew Auld <[email protected]>Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 58 ++++++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 + 3 files changed, 62 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -56,6 +56,8 @@#include "display/intel_tv.h" #include "display/intel_vdsc.h" +#include "gem/i915_gem_object.h" +#include "i915_drv.h" #include "i915_trace.h" #include "intel_acpi.h" drivers/gpu/drm/i915/display/intel_display.c static void intel_setup_outputs(struct drm_i915_private *dev_priv) · line 15504
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0@@ -15496,6 +15498,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb) {struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb); +struct drm_i915_private *dev_priv =to_i915 (fb->dev); + +/* removing the FB memory region restriction on obj, if any */ + intel_fb->front_buffer->obj =INTEL_INFO (dev_priv)->memory_regions;Is this right, assigning bitmask to something called obj?
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0drm_framebuffer_cleanup (fb);intel_frontbuffer_put (intel_fb->frontbuffer);@@ -15543,11 +15549,26 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, {struct drm_i915_private *dev_priv =to_i915 (obj->base.dev);struct drm_framebuffer *fb = &intel_fb->base; +u32 *region_map;u32 max_stride;unsigned int tiling, stride;int ret = -EINVAL ;int i;
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 15567
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+/* GEM Obj for frame buffer is expected to be in LMEM. */ +if (HAS_LMEM (dev_priv)) +if (obj->mm.region->type !=INTEL_LMEM ) { + region_map = &intel_region_map[INTEL_MEMORY_LMEM ]; + ret =i915_gem_object_mem_region_migrate (dev_priv, obj, + region_map, +1 ); +if (ret) { +DRM_ERROR ("FB migration to LMEM Failed(%d)\n" , + ret);Probably should be just debug level since it is imaginably user triggerable and not really an error for the kernel as such.
This would be a part of pin_to_display? That's where we do the other conversions required for scanout objects.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: FB backing gem obj should reside in LMEM
Quoted 72 lines · Chris Wilson
Quoting Tvrtko Ursulin (2019-09-26 09:53:03)
Quoted 57 lines · Ramalingam C
Quoted 32 lines
If Local memory is supported by hardware, we want framebuffer backing gem objects out of local memory.
If local memory is supported and gem object if not from local memory we migrate the obj into local memory. And once framebuffer is created we block the migration of the associated object out of local memory.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/cc Matthew Auld <[email protected]>Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 58 ++++++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 + 3 files changed, 62 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -56,6 +56,8 @@#include "display/intel_tv.h" #include "display/intel_vdsc.h" +#include "gem/i915_gem_object.h" +#include "i915_drv.h" #include "i915_trace.h" #include "intel_acpi.h" drivers/gpu/drm/i915/display/intel_display.c static void intel_setup_outputs(struct drm_i915_private *dev_priv) · line 15504
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0@@ -15496,6 +15498,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb) {struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb); +struct drm_i915_private *dev_priv =to_i915 (fb->dev); + +/* removing the FB memory region restriction on obj, if any */ + intel_fb->front_buffer->obj =INTEL_INFO (dev_priv)->memory_regions;Is this right, assigning bitmask to something called obj?
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0drm_framebuffer_cleanup (fb);intel_frontbuffer_put (intel_fb->frontbuffer);@@ -15543,11 +15549,26 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, {struct drm_i915_private *dev_priv =to_i915 (obj->base.dev);struct drm_framebuffer *fb = &intel_fb->base; +u32 *region_map;u32 max_stride;unsigned int tiling, stride;int ret = -EINVAL ;int i;Quoted 13 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 15567
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +10
-0+/* GEM Obj for frame buffer is expected to be in LMEM. */ +if (HAS_LMEM (dev_priv)) +if (obj->mm.region->type !=INTEL_LMEM ) { + region_map = &intel_region_map[INTEL_MEMORY_LMEM ]; + ret =i915_gem_object_mem_region_migrate (dev_priv, obj, + region_map, +1 ); +if (ret) { +DRM_ERROR ("FB migration to LMEM Failed(%d)\n" , + ret);Probably should be just debug level since it is imaginably user triggerable and not really an error for the kernel as such.
Quoted 2 lines
This would be a part of
pin_to_display? That's where we do the other conversions required for scanout objects.
I will relook through it chris. But I am just wondering when the FB is created/destroyed itself could we fix/release the memory region required?
-Ram.
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: FB backing gem obj should reside in LMEM
Quoting Ramalingam C (2019-09-27 10:12:57)
Quoted 6 lines · Chris Wilson
Quoted 2 lines
This would be a part of
pin_to_display? That's where we do the other conversions required for scanout objects.I will relook through it chris. But I am just wondering when the FB is created/destroyed itself could we fix/release the memory region required?
That would be atypical; we generally only restrict the user options while it is attached to HW, and err on the side of laziness.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: FB backing gem obj should reside in LMEM
Quoted 10 lines · Chris Wilson
Quoting Ramalingam C (2019-09-27 10:12:57)
Quoted 6 lines · Chris Wilson
Quoted 2 lines
This would be a part of
pin_to_display? That's where we do the other conversions required for scanout objects.I will relook through it chris. But I am just wondering when the FB is created/destroyed itself could we fix/release the memory region required?
That would be atypical; we generally only restrict the user options while it is attached to HW, and err on the side of laziness.
I will explore the pin_to_diplay path. Thanks Chris!
-Ram
Quoted 1 line
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: FB backing gem obj should reside in LMEM
In reply to Tvrtko UrsulinQuoted 34 lines · Tvrtko Ursulin
Quoted 32 lines · Ramalingam C
If Local memory is supported by hardware, we want framebuffer backing gem objects out of local memory.
If local memory is supported and gem object if not from local memory we migrate the obj into local memory. And once framebuffer is created we block the migration of the associated object out of local memory.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/cc Matthew Auld <[email protected]>Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 58 ++++++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 + 3 files changed, 62 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -56,6 +56,8 @@#include "display/intel_tv.h" #include "display/intel_vdsc.h" +#include "gem/i915_gem_object.h" +#include "i915_drv.h" #include "i915_trace.h" #include "intel_acpi.h" @@ -15496,6 +15498,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb)
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static void intel_setup_outputs(struct drm_i915_private *dev_priv) · line 15504
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0{struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb); +struct drm_i915_private *dev_priv =to_i915 (fb->dev); + +/* removing the FB memory region restriction on obj, if any */ + intel_fb->front_buffer->obj =INTEL_INFO (dev_priv)->memory_regions;Is this right, assigning bitmask to something called obj?
Oops. wanted to assign into the obj->memory_regions. Thanks for catching it.
Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/display/intel_display.c +6
-0drm_framebuffer_cleanup (fb);intel_frontbuffer_put (intel_fb->frontbuffer);@@ -15543,11 +15549,26 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, {struct drm_i915_private *dev_priv =to_i915 (obj->base.dev);struct drm_framebuffer *fb = &intel_fb->base; +u32 *region_map;u32 max_stride;unsigned int tiling, stride;int ret = -EINVAL ;int i; +/* GEM Obj for frame buffer is expected to be in LMEM. */ +if (HAS_LMEM (dev_priv)) +if (obj->mm.region->type !=INTEL_LMEM ) { + region_map = &intel_region_map[INTEL_MEMORY_LMEM ]; + ret = i915_gem_object_mem_region_migrate(dev_priv, obj,
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 15567
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +5
-0+ region_map, + 1); +if (ret) { +DRM_ERROR ("FB migration to LMEM Failed(%d)\n" , + ret);Probably should be just debug level since it is imaginably user triggerable and not really an error for the kernel as such.
Sure.
Quoted 84 lines
Quoted 84 lines
drivers/gpu/drm/i915/display/intel_display.c +8
-0+return ret; + } + } + intel_fb->frontbuffer =intel_frontbuffer_get (obj);if (!intel_fb->frontbuffer)return -ENOMEM ;@@ -15666,6 +15687,10 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; } +/* Blocking the migration of gem obj out of LMEM */ +if (HAS_LMEM (dev_priv)) + obj->memory_regions =REGION_LMEM ; +return 0 ; err:drivers/gpu/drm/i915/gem/i915_gem_object.c +24
-24@@ -501,30 +501,11 @@ __region_id(u32 region)return INTEL_MEMORY_UKNOWN ; } -static int i915_gem_object_region_select (struct drm_i915_private *dev_priv, -struct drm_i915_gem_object_param *args, -struct drm_file *file, -struct drm_i915_gem_object *obj) +int i915_gem_object_mem_region_migrate (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count) {struct intel_context *ce = dev_priv->engine[BCS0 ]->kernel_context; -u32 __user *uregions =u64_to_user_ptr (args->data); -u32 uregions_copy[INTEL_MEMORY_UKNOWN ]; -int i, ret; - -if (args->size >INTEL_MEMORY_UKNOWN ) -return -EINVAL ; - -memset (uregions_copy,0 ,sizeof (uregions_copy)); -for (i =0 ; i < args->size; i++) { -u32 region; - - ret =get_user (region, uregions); -if (ret) -return ret; - - uregions_copy[i] = region; - ++uregions; - }mutex_lock (&dev_priv->drm.struct_mutex); ret =i915_gem_object_prepare_move (obj);@@ -533,8 +514,8 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv, goto err; } -for (i =0 ; i < args->size; i++) { -u32 region = uregions_copy[i]; +for (i =0 ; i < region_count; i++) { +u32 region = uregions[i];enum intel_region_id id =__region_id (region);if (!(obj->memory_region & region)) {@@ -576,6 +557,35 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv,return ret; } +static int i915_gem_object_region_select (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object_param *args, +struct drm_file *file, +struct drm_i915_gem_object *obj) +{ +struct intel_context *ce = dev_priv->engine[BCS0 ]->kernel_context; +u32 __user *uregions =u64_to_user_ptr (args->data); +u32 uregions_copy[INTEL_MEMORY_UKNOWN ]; +int i, ret; + +if (args->size >INTEL_MEMORY_UKNOWN ) +return -EINVAL ; + +memset (uregions_copy,0 ,sizeof (uregions_copy)); +for (i =0 ; i < args->size; i++) { +u32 region; + + ret =get_user (region, uregions); +if (ret)
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c static int i915_gem_object_region_select(struct drm_i915_private *dev_priv, · line 583
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +5
-0+return ret; + + uregions_copy[i] = region; + ++uregions; + }I do understand this is old code (not yours) but I fail to penetrate why is this a loop and not
copy_from_user?
What i understood is, list of possible regions_maps are passed here. and they are reading it one after another.
Quoted 25 lines
Quoted 14 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +5
-0+ +return i915_gem_object_mem_region_migrate (dev_priv, obj, uregions_copy, + args->size); +} +int i915_gem_object_setparam_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {drivers/gpu/drm/i915/gem/i915_gem_object.h +0
-0drivers/gpu/drm/i915/gem/i915_gem_object.h int i915_gem_object_migrate(struct drm_i915_gem_object *obj, · line 53
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_object.h +3
-0@@ -47,6 +47,9 @@ int i915_gem_object_migrate(struct drm_i915_gem_object *obj, enum intel_region_id id);void i915_gem_flush_free_objects (struct drm_i915_private *i915); +int i915_gem_object_mem_region_migrate (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count);void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj);General approach looks feasible to me, but I'll leave guys directly involved with local memory to call it.
Quoted 3 lines
Another my comment/question would be - do we have a hook when objects are released/disassociated from the framebuffer and should we restore the allowed memory region mask to default at that point?
at present I am doing this at intel_user_framebuffer_destroy. Not sure if we have any better place for this.
-Ram
Quoted 4 lines
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: FB backing gem obj should reside in LMEM
Quoted 165 lines · Ramalingam C
Quoted 34 lines · Tvrtko Ursulin
Quoted 32 lines · Ramalingam C
If Local memory is supported by hardware, we want framebuffer backing gem objects out of local memory.
If local memory is supported and gem object if not from local memory we migrate the obj into local memory. And once framebuffer is created we block the migration of the associated object out of local memory.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/cc Matthew Auld <[email protected]>Signed-off-by Ramalingam C <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 58 ++++++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 + 3 files changed, 62 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +2
-0@@ -56,6 +56,8 @@#include "display/intel_tv.h" #include "display/intel_vdsc.h" +#include "gem/i915_gem_object.h" +#include "i915_drv.h" #include "i915_trace.h" #include "intel_acpi.h" @@ -15496,6 +15498,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb)Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static void intel_setup_outputs(struct drm_i915_private *dev_priv) · line 15504
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c +4
-0{struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb); +struct drm_i915_private *dev_priv =to_i915 (fb->dev); + +/* removing the FB memory region restriction on obj, if any */ + intel_fb->front_buffer->obj =INTEL_INFO (dev_priv)->memory_regions;Is this right, assigning bitmask to something called obj?
Oops. wanted to assign into the
obj->memory_regions. Thanks for catching it.Quoted 17 lines
Quoted 17 lines
drivers/gpu/drm/i915/display/intel_display.c +6
-0drm_framebuffer_cleanup (fb);intel_frontbuffer_put (intel_fb->frontbuffer);@@ -15543,11 +15549,26 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, {struct drm_i915_private *dev_priv =to_i915 (obj->base.dev);struct drm_framebuffer *fb = &intel_fb->base; +u32 *region_map;u32 max_stride;unsigned int tiling, stride;int ret = -EINVAL ;int i; +/* GEM Obj for frame buffer is expected to be in LMEM. */ +if (HAS_LMEM (dev_priv)) +if (obj->mm.region->type !=INTEL_LMEM ) { + region_map = &intel_region_map[INTEL_MEMORY_LMEM ]; + ret = i915_gem_object_mem_region_migrate(dev_priv, obj,Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 15567
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +5
-0+ region_map, + 1); +if (ret) { +DRM_ERROR ("FB migration to LMEM Failed(%d)\n" , + ret);Probably should be just debug level since it is imaginably user triggerable and not really an error for the kernel as such.
Sure.
Quoted 84 lines
Quoted 84 lines
drivers/gpu/drm/i915/display/intel_display.c +8
-0+return ret; + } + } + intel_fb->frontbuffer =intel_frontbuffer_get (obj);if (!intel_fb->frontbuffer)return -ENOMEM ;@@ -15666,6 +15687,10 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; } +/* Blocking the migration of gem obj out of LMEM */ +if (HAS_LMEM (dev_priv)) + obj->memory_regions =REGION_LMEM ; +return 0 ; err:drivers/gpu/drm/i915/gem/i915_gem_object.c +24
-24@@ -501,30 +501,11 @@ __region_id(u32 region)return INTEL_MEMORY_UKNOWN ; } -static int i915_gem_object_region_select (struct drm_i915_private *dev_priv, -struct drm_i915_gem_object_param *args, -struct drm_file *file, -struct drm_i915_gem_object *obj) +int i915_gem_object_mem_region_migrate (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count) {struct intel_context *ce = dev_priv->engine[BCS0 ]->kernel_context; -u32 __user *uregions =u64_to_user_ptr (args->data); -u32 uregions_copy[INTEL_MEMORY_UKNOWN ]; -int i, ret; - -if (args->size >INTEL_MEMORY_UKNOWN ) -return -EINVAL ; - -memset (uregions_copy,0 ,sizeof (uregions_copy)); -for (i =0 ; i < args->size; i++) { -u32 region; - - ret =get_user (region, uregions); -if (ret) -return ret; - - uregions_copy[i] = region; - ++uregions; - }mutex_lock (&dev_priv->drm.struct_mutex); ret =i915_gem_object_prepare_move (obj);@@ -533,8 +514,8 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv, goto err; } -for (i =0 ; i < args->size; i++) { -u32 region = uregions_copy[i]; +for (i =0 ; i < region_count; i++) { +u32 region = uregions[i];enum intel_region_id id =__region_id (region);if (!(obj->memory_region & region)) {@@ -576,6 +557,35 @@ static int i915_gem_object_region_select(struct drm_i915_private *dev_priv,return ret; } +static int i915_gem_object_region_select (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object_param *args, +struct drm_file *file, +struct drm_i915_gem_object *obj) +{ +struct intel_context *ce = dev_priv->engine[BCS0 ]->kernel_context; +u32 __user *uregions =u64_to_user_ptr (args->data); +u32 uregions_copy[INTEL_MEMORY_UKNOWN ]; +int i, ret; + +if (args->size >INTEL_MEMORY_UKNOWN ) +return -EINVAL ; + +memset (uregions_copy,0 ,sizeof (uregions_copy)); +for (i =0 ; i < args->size; i++) { +u32 region; + + ret =get_user (region, uregions); +if (ret)Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c static int i915_gem_object_region_select(struct drm_i915_private *dev_priv, · line 583
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +5
-0+return ret; + + uregions_copy[i] = region; + ++uregions; + }I do understand this is old code (not yours) but I fail to penetrate why is this a loop and not
copy_from_user?
Quoted 2 lines
What i understood is, list of possible
regions_mapsare passed here. and they are reading it one after another.
Yes, and making a kernel copy. AFAICS i == uregions at the end of the loop and args->size worth of u32 has been copied. Equivalent to copy_from_user(uregions_copy, uregions, args->size * sizeof(u32)). Maybe I am blind yet again..
Quoted 25 lines
Quoted 25 lines
Quoted 14 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +5
-0+ +return i915_gem_object_mem_region_migrate (dev_priv, obj, uregions_copy, + args->size); +} +int i915_gem_object_setparam_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {drivers/gpu/drm/i915/gem/i915_gem_object.h +0
-0drivers/gpu/drm/i915/gem/i915_gem_object.h int i915_gem_object_migrate(struct drm_i915_gem_object *obj, · line 53
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_object.h +3
-0@@ -47,6 +47,9 @@ int i915_gem_object_migrate(struct drm_i915_gem_object *obj, enum intel_region_id id);void i915_gem_flush_free_objects (struct drm_i915_private *i915); +int i915_gem_object_mem_region_migrate (struct drm_i915_private *dev_priv, +struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count);void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj);General approach looks feasible to me, but I'll leave guys directly involved with local memory to call it.
Quoted 5 lines
Quoted 3 lines
Another my comment/question would be - do we have a hook when objects are released/disassociated from the framebuffer and should we restore the allowed memory region mask to default at that point?
at present I am doing this at
intel_user_framebuffer_destroy. Not sure if we have any better place for this.
Oh it's at the top of the patch. My bad for forgetting about it. The region copying loop caused some head scratching and I forgot. :)
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/3 drm/i915: FB backing gem obj should reside in LMEM
In reply to Ramalingam CIf Local memory is supported by hardware, we want framebuffer backing gem objects out of local memory.
If local memory is supported and gem object if not from local memory we migrate the obj into local memory. And once framebuffer is created we block the migration of the associated object out of local memory.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/
v2:
memory regions are correctly assigned to obj->memory_regions [tvrtko] migration failure is reported as debug log [Tvrtko]
--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 58 ++++++++++++-------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 + 3 files changed, 61 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +25 -0
@@ -56,6 +56,8 @@#include "display/intel_tv.h" #include "display/intel_vdsc.h" +#include "gem/i915_gem_object.h" +#include "i915_drv.h" #include "i915_trace.h" #include "intel_acpi.h"
@@ -15496,6 +15498,11 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb) {struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb); +struct drm_i915_private *dev_priv =to_i915 (fb->dev); + +/* removing the FB memory region restriction on obj, if any */ + intel_fb->front_buffer->obj->memory_regions = +INTEL_INFO (dev_priv)->memory_regions;drm_framebuffer_cleanup (fb);intel_frontbuffer_put (intel_fb->frontbuffer);
@@ -15543,11 +15550,25 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, {struct drm_i915_private *dev_priv =to_i915 (obj->base.dev);struct drm_framebuffer *fb = &intel_fb->base; +u32 *region_map;u32 max_stride;unsigned int tiling, stride;int ret = -EINVAL ;int i; +/* GEM Obj for frame buffer is expected to be in LMEM. */ +if (HAS_LMEM (dev_priv)) +if (obj->mm.region->type !=INTEL_LMEM ) { + region_map = &intel_region_map[INTEL_MEMORY_LMEM ]; + ret =i915_gem_object_mem_region_migrate (obj, + region_map,1 ); +if (ret) { +DRM_DEBUG_KMS ("Migration to LMEM Failed(%d)\n" , + ret); +return ret; + } + } + intel_fb->frontbuffer =intel_frontbuffer_get (obj);if (!intel_fb->frontbuffer)return -ENOMEM ;
@@ -15666,6 +15687,10 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, goto err; } +/* Blocking the migration of gem obj out of LMEM */ +if (HAS_LMEM (dev_priv)) + obj->memory_regions =REGION_LMEM ; +return 0 ; err:
drivers/gpu/drm/i915/gem/i915_gem_object.c +34 -24
78 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_object.h +2 -0
@@ -47,6 +47,8 @@ int i915_gem_object_migrate(struct drm_i915_gem_object *obj, enum intel_region_id id);void i915_gem_flush_free_objects (struct drm_i915_private *i915); +int i915_gem_object_mem_region_migrate (struct drm_i915_gem_object *obj, +u32 *uregions,u32 region_count);void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 70 lines · Ramalingam C
When LMEM is supported, dumb buffer preferred to be created from LMEM.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/.v2:
Parameters are reshuffled. [Chris]Signed-off-by Ramalingam C <[email protected]>cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_gem.c +14
-2@@ -44,6 +44,7 @@#include "gem/i915_gem_clflush.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" +#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_pm.h" #include "gt/intel_engine_user.h" #include "gt/intel_gt.h" @@ -160,6 +161,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,static int i915_gem_create (struct drm_file *file,struct drm_i915_private *dev_priv, +enum intel_region_id mem_region,u64 *size_p,u32 *handle_p) {@@ -173,7 +175,12 @@ i915_gem_create(struct drm_file *file,return -EINVAL ;/* Allocate the new object */ - obj =i915_gem_object_create_shmem (dev_priv, size); +if (mem_region ==INTEL_MEMORY_LMEM ) + obj =i915_gem_object_create_lmem (dev_priv, size,0 ); +else if (mem_region ==INTEL_MEMORY_STOLEN ) + obj =i915_gem_object_create_stolen (dev_priv, size); +else + obj =i915_gem_object_create_shmem (dev_priv, size);if (IS_ERR (obj))return PTR_ERR (obj);@@ -193,6 +200,7 @@ i915_gem_dumb_create(struct drm_file *file,struct drm_device *dev, struct drm_mode_create_dumb *args) { + enum intel_region_id mem_region = INTEL_MEMORY_UKNOWN;int cpp =DIV_ROUND_UP (args->bpp,8 );u32 format;@@ -219,7 +227,11 @@ i915_gem_dumb_create(struct drm_file *file, args->pitch =ALIGN (args->pitch,4096 ); args->size = args->pitch * args->height; -return i915_gem_create (file,to_i915 (dev), + +if (HAS_LMEM (to_i915 (dev))) + mem_region =INTEL_MEMORY_LMEM ; + +return i915_gem_create (file,to_i915 (dev), mem_region, &args->size, &args->handle); }
drivers/gpu/drm/i915/i915_gem.c i915_gem_create_ioctl(struct drm_device *dev, void *data, · line 254
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -238,7 +250,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,i915_gem_flush_free_objects (dev_priv); -return i915_gem_create (file, dev_priv, +return i915_gem_create (file, dev_priv,INTEL_MEMORY_UKNOWN , &args->size, &args->handle);
We don't have shmem memory region? Or default? Or is unknown supposed to mean default for a given platform?
Regards,
Tvrtko
drivers/gpu/drm/i915/i915_gem.c i915_gem_create_ioctl(struct drm_device *dev, void *data, · line 256
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem.c +0
-0}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 66 lines · Tvrtko Ursulin
Quoted 64 lines · Ramalingam C
When LMEM is supported, dumb buffer preferred to be created from LMEM.
This is developed on top of v3 LMEM series
https://patchwork.freedesktop.org/series/56683/.v2:
Parameters are reshuffled. [Chris]Signed-off-by Ramalingam C <[email protected]>cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_gem.c +14
-2@@ -44,6 +44,7 @@#include "gem/i915_gem_clflush.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" +#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_pm.h" #include "gt/intel_engine_user.h" #include "gt/intel_gt.h" @@ -160,6 +161,7 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj,static int i915_gem_create (struct drm_file *file,struct drm_i915_private *dev_priv, +enum intel_region_id mem_region,u64 *size_p,u32 *handle_p) {@@ -173,7 +175,12 @@ i915_gem_create(struct drm_file *file,return -EINVAL ;/* Allocate the new object */ - obj =i915_gem_object_create_shmem (dev_priv, size); +if (mem_region ==INTEL_MEMORY_LMEM ) + obj =i915_gem_object_create_lmem (dev_priv, size,0 ); +else if (mem_region ==INTEL_MEMORY_STOLEN ) + obj =i915_gem_object_create_stolen (dev_priv, size); +else + obj =i915_gem_object_create_shmem (dev_priv, size);if (IS_ERR (obj))return PTR_ERR (obj);@@ -193,6 +200,7 @@ i915_gem_dumb_create(struct drm_file *file,struct drm_device *dev, struct drm_mode_create_dumb *args) { + enum intel_region_id mem_region = INTEL_MEMORY_UKNOWN;int cpp =DIV_ROUND_UP (args->bpp,8 );u32 format;@@ -219,7 +227,11 @@ i915_gem_dumb_create(struct drm_file *file, args->pitch =ALIGN (args->pitch,4096 ); args->size = args->pitch * args->height; -return i915_gem_create (file,to_i915 (dev), + +if (HAS_LMEM (to_i915 (dev))) + mem_region =INTEL_MEMORY_LMEM ; + +return i915_gem_create (file,to_i915 (dev), mem_region, &args->size, &args->handle); }
Quoted 8 lines
drivers/gpu/drm/i915/i915_gem.c i915_gem_create_ioctl(struct drm_device *dev, void *data, · line 252
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c +1
-1@@ -238,7 +250,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data,i915_gem_flush_free_objects (dev_priv); -return i915_gem_create (file, dev_priv, +return i915_gem_create (file, dev_priv,INTEL_MEMORY_UKNOWN , &args->size, &args->handle);We don't have shmem memory region? Or default? Or is unknown supposed to mean default for a given platform?
I take this as default. Not sure if we need to pass anything (default region) specifically.
-Ram
Quoted 7 lines
Regards,
Tvrtko
Quoted 2 lines
drivers/gpu/drm/i915/i915_gem.c +0
-0}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BUILD: failure for series starting with [1/3] drm/i915: Create dumb buffer from LMEM (rev3)
In reply to Ramalingam C== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Create dumb buffer from LMEM (rev3)
URL : https://patchwork.freedesktop.org/series/67259/
State : failure
== Summary ==
Applying: drm/i915: Create dumb buffer from LMEM
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/i915_gem.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: Create dumb buffer from LMEM
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx