drm/i915: enumerate and init each supported region
Subsystems (2)
PATCH v3 1/3 drm/i915: enumerate and init each supported region
From: Abdiel Janulgue <[email protected]>
Nothing to enumerate yet...
--- drivers/gpu/drm/i915/i915_drv.h | 7 +++ drivers/gpu/drm/i915/i915_gem_gtt.c | 56 ++++++++++++++++--- drivers/gpu/drm/i915/intel_device_info.h | 2 + drivers/gpu/drm/i915/intel_memory_region.h | 16 ++++++ .../gpu/drm/i915/selftests/mock_gem_device.c | 6 ++ 5 files changed, 80 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +7 -0
@@ -684,6 +684,8 @@ struct i915_gem_mm {*/ struct vfsmount *gemfs; +struct intel_memory_region *regions[INTEL_REGION_UNKNOWN ]; +struct notifier_block oom_notifier;struct notifier_block vmap_notifier;struct shrinker shrinker;
@@ -1783,6 +1785,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc) +#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i)) +#define HAS_GT_UC (dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc)/* Having GuC is not the same as using GuC */
@@ -2001,6 +2005,9 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, unsigned int flags);int i915_gem_evict_vm (struct i915_address_space *vm); +void i915_gem_cleanup_memory_regions (struct drm_i915_private *i915); +int i915_gem_init_memory_regions (struct drm_i915_private *i915); +/* i915_gem_internal.c */ struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/i915_gem_gtt.c +49 -7
80 lines not on this page · raw message
drivers/gpu/drm/i915/intel_device_info.h +2 -0
@@ -160,6 +160,8 @@ struct intel_device_info {unsigned int page_sizes;/* page sizes supported by the HW */ +u32 memory_regions;/* regions supported by the HW */ +u32 display_mmio_offset;u8 pipe_mask;
drivers/gpu/drm/i915/intel_memory_region.h +16 -0
@@ -18,6 +18,22 @@ struct drm_i915_gem_object;struct intel_memory_region ;struct sg_table ; +/** +* Base memory type +*/ +enum intel_memory_type { +INTEL_MEMORY_UNKNOWN =0 , +}; + +enum intel_region_id { +INTEL_REGION_UNKNOWN =0 ,/* Should be last */ +}; + +#define INTEL_MEMORY_TYPE_SHIFT 16 + +#define MEMORY_TYPE_FROM_REGION (r) (ilog2((r) >> INTEL_MEMORY_TYPE_SHIFT)) +#define MEMORY_INSTANCE_FROM_REGION (r) (ilog2((r) & 0xffff)) +#define I915_ALLOC_MIN_PAGE_SIZE BIT(0)#define I915_ALLOC_CONTIGUOUS BIT(1)
drivers/gpu/drm/i915/selftests/mock_gem_device.c +6 -0
@@ -74,6 +74,8 @@ static void mock_device_release(struct drm_device *dev)i915_gemfs_fini (i915); +i915_gem_cleanup_memory_regions (i915); +drm_mode_config_cleanup (&i915->drm);drm_dev_fini (&i915->drm);
@@ -196,6 +198,10 @@ struct drm_i915_private *mock_gem_device(void)WARN_ON (i915_gemfs_init (i915)); + err =i915_gem_init_memory_regions (i915); +if (err) + goto err_context; +return i915; err_context:
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/3 drm/i915: treat shmem as a region
Convert shmem to an intel_memory_region.
--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 5 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_region.c | 7 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 79 ++++++++++++++----- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 9 --- drivers/gpu/drm/i915/i915_gem_gtt.c | 15 ++++ drivers/gpu/drm/i915/i915_pci.c | 29 +++++-- drivers/gpu/drm/i915/intel_memory_region.c | 8 ++ drivers/gpu/drm/i915/intel_memory_region.h | 13 ++- .../gpu/drm/i915/selftests/mock_gem_device.c | 7 +- 11 files changed, 131 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.h +3 -2
@@ -25,10 +25,11 @@ 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_gem_object * -i915_gem_object_create_shmem (struct drm_i915_private *i915,u64 size); +i915_gem_object_create_shmem (struct drm_i915_private *i915, +resource_size_t size);struct drm_i915_gem_object *i915_gem_object_create_shmem_from_data (struct drm_i915_private *i915, -const void *data,size_t size); +const void *data,resource_size_t size);extern const struct drm_i915_gem_object_ops i915_gem_shmem_ops; void __i915_gem_object_release_shmem(struct drm_i915_gem_object *obj,
drivers/gpu/drm/i915/gem/i915_gem_phys.c +4 -1
@@ -16,6 +16,7 @@#include "gt/intel_gt.h" #include "i915_drv.h" #include "i915_gem_object.h" +#include "i915_gem_region.h" #include "i915_scatterlist.h" static int i915_gem_object_get_pages_phys (struct drm_i915_gem_object *obj)
@@ -191,8 +192,10 @@ int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, int align)/* Perma-pin (until release) the physical set of pages */ __i915_gem_object_pin_pages (obj); -if (!IS_ERR_OR_NULL (pages)) +if (!IS_ERR_OR_NULL (pages)) { i915_gem_shmem_ops.put_pages (obj, pages); +i915_gem_object_release_memory_region (obj); + }mutex_unlock (&obj->mm.lock);return 0 ;
drivers/gpu/drm/i915/gem/i915_gem_region.c +6 -1
@@ -6,6 +6,7 @@#include "intel_memory_region.h" #include "i915_gem_region.h" #include "i915_drv.h" +#include "i915_trace.h" void i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj,
@@ -165,5 +166,9 @@ i915_gem_object_create_region(struct intel_memory_region *mem,if (overflows_type (size, obj->base.size))return ERR_PTR (-E2BIG ); -return mem->ops->create_object (mem, size, flags); + obj = mem->ops->create_object (mem, size, flags); +if (!IS_ERR (obj)) +trace_i915_gem_object_create (obj); + +return obj; }
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +58 -21
148 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1876,6 +1876,8 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv);int i915_gem_freeze (struct drm_i915_private *dev_priv);int i915_gem_freeze_late (struct drm_i915_private *dev_priv); +struct intel_memory_region *i915_gem_shmem_setup (struct drm_i915_private *i915); +static inline void i915_gem_drain_freed_objects (struct drm_i915_private *i915) {/*
drivers/gpu/drm/i915/i915_gem.c +0 -9
@@ -45,7 +45,6 @@#include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_pm.h" -#include "gem/i915_gemfs.h" #include "gt/intel_engine_user.h" #include "gt/intel_gt.h" #include "gt/intel_gt_pm.h"
@@ -1435,16 +1434,10 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)void i915_gem_init_early (struct drm_i915_private *dev_priv) { -int err; -i915_gem_init__mm (dev_priv);i915_gem_init__pm (dev_priv);spin_lock_init (&dev_priv->fb_tracking.lock); - - err =i915_gemfs_init (dev_priv); -if (err) -DRM_NOTE ("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n" , err); }void i915_gem_cleanup_early (struct drm_i915_private *dev_priv)
@@ -1453,8 +1446,6 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)GEM_BUG_ON (!llist_empty (&dev_priv->mm.free_list));GEM_BUG_ON (atomic_read (&dev_priv->mm.free_count));WARN_ON (dev_priv->mm.shrink_count); - -i915_gemfs_fini (dev_priv); }int i915_gem_freeze (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_gem_gtt.c +15 -0
@@ -2773,14 +2773,29 @@ int i915_gem_init_memory_regions(struct drm_i915_private *i915)for (i =0 ; i <INTEL_REGION_UNKNOWN ; i++) {struct intel_memory_region *mem =ERR_PTR (-ENODEV ); +u32 type;if (!HAS_REGION (i915,BIT (i)))continue ; + type =MEMORY_TYPE_FROM_REGION (intel_region_map[i]); +switch (type) { +case INTEL_MEMORY_SYSTEM : + mem =i915_gem_shmem_setup (i915); +break ; + } +if (IS_ERR (mem)) { err =PTR_ERR (mem); +DRM_ERROR ("Failed to setup region(%d) type=%d\n" , err, type); goto out_cleanup; } + + mem->id = intel_region_map[i]; + mem->type = type; + mem->instance =MEMORY_INSTANCE_FROM_REGION (intel_region_map[i]); + + i915->mm.regions[i] = mem; }return 0 ;
drivers/gpu/drm/i915/i915_pci.c +21 -8
@@ -151,6 +151,9 @@#define GEN_DEFAULT_PAGE_SIZES \ .page_sizes = I915_GTT_PAGE_SIZE_4K +#define GEN_DEFAULT_REGIONS \ + .memory_regions = REGION_SMEM +#define I830_FEATURES \ GEN(2), \ .is_mobile = 1, \
@@ -168,7 +171,8 @@I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \I9XX_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONS#define I845_FEATURES \ GEN(2), \
@@ -185,7 +189,8 @@I845_PIPE_OFFSETS , \I845_CURSOR_OFFSETS , \I9XX_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_i830_info = {I830_FEATURES ,
@@ -219,7 +224,8 @@ static const struct intel_device_info intel_i865g_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \I9XX_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_i915g_info = {GEN3_FEATURES ,
@@ -304,7 +310,8 @@ static const struct intel_device_info intel_pineview_m_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \I965_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_i965g_info = {GEN4_FEATURES ,
@@ -354,7 +361,8 @@ static const struct intel_device_info intel_gm45_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \ILK_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_ironlake_d_info = {GEN5_FEATURES ,
@@ -384,7 +392,8 @@ static const struct intel_device_info intel_ironlake_m_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \ILK_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONS#define SNB_D_PLATFORM \ GEN6_FEATURES, \
@@ -432,7 +441,8 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info = {IVB_PIPE_OFFSETS , \IVB_CURSOR_OFFSETS , \IVB_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONS#define IVB_D_PLATFORM \ GEN7_FEATURES, \
@@ -493,6 +503,7 @@ static const struct intel_device_info intel_valleyview_info = {I9XX_CURSOR_OFFSETS ,I965_COLORS ,GEN_DEFAULT_PAGE_SIZES , + GEN_DEFAULT_REGIONS, };#define G75_FEATURES \
@@ -587,6 +598,7 @@ static const struct intel_device_info intel_cherryview_info = {CHV_CURSOR_OFFSETS ,CHV_COLORS ,GEN_DEFAULT_PAGE_SIZES , + GEN_DEFAULT_REGIONS, };#define GEN9_DEFAULT_PAGE_SIZES \
@@ -661,7 +673,8 @@ static const struct intel_device_info intel_skylake_gt4_info = {HSW_PIPE_OFFSETS , \IVB_CURSOR_OFFSETS , \IVB_COLORS , \ - GEN9_DEFAULT_PAGE_SIZES +GEN9_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_broxton_info = {GEN9_LP_FEATURES ,
drivers/gpu/drm/i915/intel_memory_region.c +8 -0
@@ -6,6 +6,14 @@#include "intel_memory_region.h" #include "i915_drv.h" +/* XXX: Hysterical raisins. BIT(inst) needs to just be (inst) at some point. */ +#define REGION_MAP (type, inst) \ + BIT((type) + INTEL_MEMORY_TYPE_SHIFT) | BIT(inst) + +const u32 intel_region_map[] = { + [INTEL_REGION_SMEM ] =REGION_MAP (INTEL_MEMORY_SYSTEM ,0 ), +}; +static u64 intel_memory_region_free_pages (struct intel_memory_region *mem,struct list_head *blocks)
drivers/gpu/drm/i915/intel_memory_region.h +11 -2
@@ -22,13 +22,17 @@ struct sg_table;* Base memory type */ enum intel_memory_type { -INTEL_MEMORY_UNKNOWN =0 , +INTEL_MEMORY_SYSTEM =0 , +INTEL_MEMORY_UNKNOWN , };enum intel_region_id { -INTEL_REGION_UNKNOWN =0 ,/* Should be last */ +INTEL_REGION_SMEM =0 , +INTEL_REGION_UNKNOWN ,/* Should be last */ }; +#define REGION_SMEM BIT(INTEL_REGION_SMEM) +#define INTEL_MEMORY_TYPE_SHIFT 16#define MEMORY_TYPE_FROM_REGION (r) (ilog2((r) >> INTEL_MEMORY_TYPE_SHIFT))
@@ -37,6 +41,11 @@ enum intel_region_id {#define I915_ALLOC_MIN_PAGE_SIZE BIT(0)#define I915_ALLOC_CONTIGUOUS BIT(1) +/** +* Memory regions encoded as type | instance +*/ +extern const u32 intel_region_map[]; +struct intel_memory_region_ops {unsigned int flags;
drivers/gpu/drm/i915/selftests/mock_gem_device.c +3 -4
@@ -72,8 +72,6 @@ static void mock_device_release(struct drm_device *dev)mock_fini_ggtt (&i915->ggtt);destroy_workqueue (i915->wq); -i915_gemfs_fini (i915); -i915_gem_cleanup_memory_regions (i915);drm_mode_config_cleanup (&i915->drm);
@@ -165,7 +163,10 @@ struct drm_i915_private *mock_gem_device(void)I915_GTT_PAGE_SIZE_64K |I915_GTT_PAGE_SIZE_2M ; +mkwrite_device_info (i915)->memory_regions =REGION_SMEM ; +mock_uncore_init (&i915->uncore, i915); +i915_gem_init__mm (i915);intel_gt_init_early (&i915->gt, i915);atomic_inc (&i915->gt.wakeref.count);/* disable; no hw support */
@@ -196,8 +197,6 @@ struct drm_i915_private *mock_gem_device(void)intel_engines_driver_register (i915); -WARN_ON (i915_gemfs_init (i915)); - err =i915_gem_init_memory_regions (i915);if (err) goto err_context;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/3 drm/i915: treat stolen as a region
In reply to Matthew AuldConvert stolen memory over to a region object. Still leaves open the question with what to do with pre-allocated objects...
--- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 65 +++++++++++++++++++--- drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 14 +---- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_memory_region.c | 1 + drivers/gpu/drm/i915/intel_memory_region.h | 3 + 6 files changed, 65 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +56 -9
@@ -10,6 +10,7 @@#include <drm/drm_mm.h> #include <drm/i915_drm.h> +#include "gem/i915_gem_region.h" #include "i915_drv.h" #include "i915_gem_stolen.h"
@@ -150,7 +151,7 @@ static int i915_adjust_stolen(struct drm_i915_private *dev_priv,return 0 ; } -void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv) +static void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv) {if (!drm_mm_initialized (&dev_priv->mm.stolen))return ;
@@ -355,7 +356,7 @@ static void icl_get_stolen_reserved(struct drm_i915_private *i915, } } -int i915_gem_init_stolen (struct drm_i915_private *dev_priv) +static int i915_gem_init_stolen (struct drm_i915_private *dev_priv) {resource_size_t reserved_base, stolen_top;resource_size_t reserved_total, reserved_size;
@@ -539,6 +540,9 @@ i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)i915_gem_stolen_remove_node (dev_priv, stolen);kfree (stolen); + +if (obj->mm.region) +i915_gem_object_release_memory_region (obj); }static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = {
@@ -548,8 +552,9 @@ static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = { };static struct drm_i915_gem_object * -_i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, -struct drm_mm_node *stolen) +__i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, +struct drm_mm_node *stolen, +struct intel_memory_region *mem) {struct drm_i915_gem_object *obj;unsigned int cache_level;
@@ -571,6 +576,9 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,if (err) goto cleanup; +if (mem) +i915_gem_object_init_memory_region (obj, mem,0 ); +return obj; cleanup:
@@ -579,10 +587,12 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,return ERR_PTR (err); } -struct drm_i915_gem_object * -i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, -resource_size_t size) +static struct drm_i915_gem_object * +_i915_gem_object_create_stolen (struct intel_memory_region *mem, +resource_size_t size, +unsigned int flags) { +struct drm_i915_private *dev_priv = mem->i915;struct drm_i915_gem_object *obj;struct drm_mm_node *stolen;int ret;
@@ -603,7 +613,7 @@ i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, goto err_free; } - obj =_i915_gem_object_create_stolen (dev_priv, stolen); + obj =__i915_gem_object_create_stolen (dev_priv, stolen, mem);if (IS_ERR (obj)) goto err_remove;
@@ -616,6 +626,43 @@ i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,return obj; } +struct drm_i915_gem_object * +i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, +resource_size_t size) +{ +return i915_gem_object_create_region (dev_priv->mm.regions[INTEL_REGION_STOLEN ], + size,I915_BO_ALLOC_CONTIGUOUS ); +} + +static int init_stolen (struct intel_memory_region *mem) +{ +/* +* Initialise stolen early so that we may reserve preallocated +* objects for the BIOS to KMS transition. +*/ +return i915_gem_init_stolen (mem->i915); +} + +static void release_stolen (struct intel_memory_region *mem) +{ +i915_gem_cleanup_stolen (mem->i915); +} + +static const struct intel_memory_region_ops i915_region_stolen_ops = { + .init = init_stolen, + .release = release_stolen, + .create_object = _i915_gem_object_create_stolen, +}; + +struct intel_memory_region *i915_gem_stolen_setup (struct drm_i915_private *i915) +{ +return intel_memory_region_create (i915, + intel_graphics_stolen_res.start, +resource_size (&intel_graphics_stolen_res), +PAGE_SIZE ,0 , + &i915_region_stolen_ops); +} +struct drm_i915_gem_object * i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv, resource_size_t stolen_offset,
@@ -655,7 +702,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privreturn ERR_PTR (ret); } - obj =_i915_gem_object_create_stolen (dev_priv, stolen); + obj =__i915_gem_object_create_stolen (dev_priv, stolen,NULL );if (IS_ERR (obj)) {DRM_DEBUG_DRIVER ("failed to allocate stolen object\n" );i915_gem_stolen_remove_node (dev_priv, stolen);
drivers/gpu/drm/i915/gem/i915_gem_stolen.h +1 -2
@@ -21,8 +21,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv, u64 end);void i915_gem_stolen_remove_node (struct drm_i915_private *dev_priv,struct drm_mm_node *node); -int i915_gem_init_stolen (struct drm_i915_private *dev_priv); -void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv); +struct intel_memory_region *i915_gem_stolen_setup (struct drm_i915_private *i915);struct drm_i915_gem_object *i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,resource_size_t size);
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -11
@@ -2748,8 +2748,6 @@ void i915_gem_cleanup_memory_regions(struct drm_i915_private *i915) {int i; -i915_gem_cleanup_stolen (i915); -for (i =0 ; i <INTEL_REGION_UNKNOWN ; i++) {struct intel_memory_region *region = i915->mm.regions[i];
@@ -2762,15 +2760,6 @@ int i915_gem_init_memory_regions(struct drm_i915_private *i915) {int err, i; -/* -* Initialise stolen early so that we may reserve preallocated -* objects for the BIOS to KMS transition. -*/ -/* XXX: stolen will become a region at some point */ - err =i915_gem_init_stolen (i915); -if (err) -return err; -for (i =0 ; i <INTEL_REGION_UNKNOWN ; i++) {struct intel_memory_region *mem =ERR_PTR (-ENODEV );u32 type;
@@ -2783,6 +2772,9 @@ int i915_gem_init_memory_regions(struct drm_i915_private *i915)case INTEL_MEMORY_SYSTEM : mem =i915_gem_shmem_setup (i915);break ; +case INTEL_MEMORY_STOLEN : + mem =i915_gem_stolen_setup (i915); +break ; }if (IS_ERR (mem)) {
drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -152,7 +152,7 @@ .page_sizes = I915_GTT_PAGE_SIZE_4K#define GEN_DEFAULT_REGIONS \ - .memory_regions = REGION_SMEM + .memory_regions = REGION_SMEM | REGION_STOLEN#define I830_FEATURES \ GEN(2), \
drivers/gpu/drm/i915/intel_memory_region.c +1 -0
@@ -12,6 +12,7 @@const u32 intel_region_map[] = { [INTEL_REGION_SMEM ] =REGION_MAP (INTEL_MEMORY_SYSTEM ,0 ), + [INTEL_REGION_STOLEN ] =REGION_MAP (INTEL_MEMORY_STOLEN ,0 ), }; static u64
drivers/gpu/drm/i915/intel_memory_region.h +3 -0
@@ -23,15 +23,18 @@ struct sg_table;*/ enum intel_memory_type {INTEL_MEMORY_SYSTEM =0 , +INTEL_MEMORY_STOLEN ,INTEL_MEMORY_UNKNOWN , };enum intel_region_id {INTEL_REGION_SMEM =0 , +INTEL_REGION_STOLEN ,INTEL_REGION_UNKNOWN ,/* Should be last */ };#define REGION_SMEM BIT(INTEL_REGION_SMEM) +#define REGION_STOLEN BIT(INTEL_REGION_STOLEN)#define INTEL_MEMORY_TYPE_SHIFT 16
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 3/3] drm/i915: treat stolen as a region
Quoting Matthew Auld (2019-10-18 11:44:50)
Quoted 7 lines
Convert stolen memory over to a region object. Still leaves open the question with what to do with pre-allocated objects...
Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Abdiel Janulgue <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Blast. I got confused by patchwork and pushed the wrong series. :( Oh well, my apologies for messing up the flow.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BUILD: failure for series starting with [v3,1/3] drm/i915: enumerate and init each supported region
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: series starting with [v3,1/3] drm/i915: enumerate and init each supported region
URL : https://patchwork.freedesktop.org/series/68189/
State : failure
== Summary ==
Applying: drm/i915: enumerate and init each supported region
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_drv.h
M drivers/gpu/drm/i915/i915_gem_gtt.c
M drivers/gpu/drm/i915/intel_device_info.h
M drivers/gpu/drm/i915/intel_memory_region.h
M drivers/gpu/drm/i915/selftests/mock_gem_device.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c Auto-merging drivers/gpu/drm/i915/intel_memory_region.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_memory_region.h Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c Auto-merging drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm/i915: enumerate and init each supported region 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