drm/xe: Move VRAM from GT to tile
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]~
PATCH 10/31 drm/xe: Move VRAM from GT to tile
On platforms with VRAM, the VRAM is associated with the tile, not the GT.
v2:
- Unsquash the GGTT handling back into its own patch.
- Fix kunit test build
v3:
- Tweak the "FIXME" comment to clarify that this function will be completely gone by the end of the series. (Lucas)
v4:
- Move a few changes that were supposed to be part of the GGTT patch back to that commit. (Gustavo)
--- drivers/gpu/drm/xe/tests/xe_bo.c | 6 +- drivers/gpu/drm/xe/xe_bo.c | 44 ++++++------ drivers/gpu/drm/xe/xe_bo.h | 4 +- drivers/gpu/drm/xe/xe_device.c | 4 -- drivers/gpu/drm/xe/xe_device_types.h | 30 ++++++++ drivers/gpu/drm/xe/xe_gt.c | 82 ++-------------------- drivers/gpu/drm/xe/xe_gt.h | 1 - drivers/gpu/drm/xe/xe_gt_pagefault.c | 6 +- drivers/gpu/drm/xe/xe_gt_types.h | 37 ---------- drivers/gpu/drm/xe/xe_irq.c | 2 +- drivers/gpu/drm/xe/xe_mmio.c | 53 +++++++------- drivers/gpu/drm/xe/xe_mmio.h | 2 +- drivers/gpu/drm/xe/xe_pci.c | 2 - drivers/gpu/drm/xe/xe_query.c | 4 +- drivers/gpu/drm/xe/xe_res_cursor.h | 2 +- drivers/gpu/drm/xe/xe_tile.c | 33 ++++++++- drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 18 ++--- drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 16 ++--- drivers/gpu/drm/xe/xe_ttm_vram_mgr.h | 4 +- drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 6 +- 20 files changed, 151 insertions(+), 205 deletions(-)
drivers/gpu/drm/xe/tests/xe_bo.c +3 -3
@@ -115,9 +115,9 @@ static void ccs_test_run_gt(struct xe_device *xe, struct xe_gt *gt,int ret;/* TODO: Sanity check */ - vram_bit =XE_BO_CREATE_VRAM0_BIT << gt->info.vram_id; + vram_bit =XE_BO_CREATE_VRAM0_BIT <<gt_to_tile (gt)->id;kunit_info (test,"Testing gt id %u vram id %u\n" , gt->info.id, - gt->info.vram_id); +gt_to_tile (gt)->id); bo =xe_bo_create_locked (xe,NULL ,NULL ,SZ_1M , ttm_bo_type_device, vram_bit);
@@ -179,7 +179,7 @@ static int evict_test_run_gt(struct xe_device *xe, struct xe_gt *gt, struct kuniint err, i;kunit_info (test,"Testing device %s gt id %u vram id %u\n" , -dev_name (xe->drm.dev), gt->info.id, gt->info.vram_id); +dev_name (xe->drm.dev), gt->info.id,gt_to_tile (gt)->id);for (i =0 ; i <2 ; ++i) {xe_vm_lock (vm, &ww,0 , false);
drivers/gpu/drm/xe/xe_bo.c +22 -22
120 lines not on this page · raw message
drivers/gpu/drm/xe/xe_bo.h +2 -2
@@ -22,7 +22,7 @@/* -- */ #define XE_BO_CREATE_STOLEN_BIT BIT(4)#define XE_BO_CREATE_VRAM_IF_DGFX (gt) \ - (IS_DGFX(gt_to_xe(gt)) ? XE_BO_CREATE_VRAM0_BIT << gt->info.vram_id : \ + (IS_DGFX(gt_to_xe(gt)) ? XE_BO_CREATE_VRAM0_BIT << gt_to_tile(gt)->id : \ XE_BO_CREATE_SYSTEM_BIT)#define XE_BO_CREATE_GGTT_BIT BIT(5)#define XE_BO_CREATE_IGNORE_MIN_PAGE_SIZE_BIT BIT(6)
@@ -108,7 +108,7 @@ struct xe_bo *xe_bo_create_from_data(struct xe_device *xe, struct xe_gt *gt,int xe_bo_placement_for_flags (struct xe_device *xe,struct xe_bo *bo,u32 bo_flags); -struct xe_gt *xe_bo_to_gt (struct xe_bo *bo); +struct xe_tile *xe_bo_to_tile (struct xe_bo *bo);static inline struct xe_bo *ttm_to_xe_bo (const struct ttm_buffer_object *bo) {
drivers/gpu/drm/xe/xe_device.c +0 -4
@@ -299,10 +299,6 @@ int xe_device_probe(struct xe_device *xe) err =xe_tile_init_noalloc (tile);if (err) goto err_irq_shutdown; - - err =xe_gt_init_noalloc (&tile->primary_gt); -if (err) - goto err_irq_shutdown; }/* Allocate and map stolen after potential VRAM resize */
drivers/gpu/drm/xe/xe_device_types.h +30 -0
@@ -102,6 +102,36 @@ struct xe_tile {/** @mem: memory management info for tile */ struct { +/** +* @vram: VRAM info for tile. +* +* Although VRAM is associated with a specific tile, it can +* still be accessed by all tiles' GTs. +*/ +struct { +/** @io_start: IO start address of this VRAM instance */ +resource_size_t io_start; +/** +* @io_size: IO size of this VRAM instance +* +* This represents how much of this VRAM we can access +* via the CPU through the VRAM BAR. This can be smaller +* than @size, in which case only part of VRAM is CPU +* accessible (typically the first 256M). This +* configuration is known as small-bar. +*/ +resource_size_t io_size; +/** @base: offset of VRAM starting base */ +resource_size_t base; +/** @size: size of VRAM. */ +resource_size_t size; +/** @mapping: pointer to VRAM mappable space */ +void *__iomem mapping; + } vram; + +/** @vram_mgr: VRAM TTM manager */ +struct xe_ttm_vram_mgr *vram_mgr; +/** @ggtt: Global graphics translation table */ struct xe_ggtt *ggtt; } mem;
drivers/gpu/drm/xe/xe_gt.c +5 -77
111 lines not on this page · raw message
drivers/gpu/drm/xe/xe_gt.h +0 -1
@@ -18,7 +18,6 @@int xe_gt_alloc (struct xe_device *xe,struct xe_gt *gt);int xe_gt_init_early (struct xe_gt *gt); -int xe_gt_init_noalloc (struct xe_gt *gt);int xe_gt_init (struct xe_gt *gt);int xe_gt_record_default_lrcs (struct xe_gt *gt);void xe_gt_suspend_prepare (struct xe_gt *gt);
drivers/gpu/drm/xe/xe_gt_pagefault.c +4 -2
@@ -107,6 +107,7 @@ static struct xe_vma *lookup_vma(struct xe_vm *vm, u64 page_addr)static int handle_pagefault (struct xe_gt *gt,struct pagefault *pf) {struct xe_device *xe =gt_to_xe (gt); +struct xe_tile *tile =gt_to_tile (gt);struct xe_vm *vm;struct xe_vma *vma =NULL ;struct xe_bo *bo;
@@ -195,7 +196,7 @@ static int handle_pagefault(struct xe_gt *gt, struct pagefault *pf) }/* Migrate to VRAM, move should invalidate the VMA first */ - ret =xe_bo_migrate (bo,XE_PL_VRAM0 + gt->info.vram_id); + ret =xe_bo_migrate (bo,XE_PL_VRAM0 + tile->id);if (ret) goto unlock_dma_resv; }else if (bo) {
@@ -498,6 +499,7 @@ static struct xe_vma *get_acc_vma(struct xe_vm *vm, struct acc *acc)static int handle_acc (struct xe_gt *gt,struct acc *acc) {struct xe_device *xe =gt_to_xe (gt); +struct xe_tile *tile =gt_to_tile (gt);struct xe_vm *vm;struct xe_vma *vma;struct xe_bo *bo;
@@ -553,7 +555,7 @@ static int handle_acc(struct xe_gt *gt, struct acc *acc) goto unlock_vm;/* Migrate to VRAM, move should invalidate the VMA first */ - ret =xe_bo_migrate (bo,XE_PL_VRAM0 + gt->info.vram_id); + ret =xe_bo_migrate (bo,XE_PL_VRAM0 + tile->id);if (only_needs_bo_lock (bo))xe_bo_unlock (bo, &ww);
drivers/gpu/drm/xe/xe_gt_types.h +0 -37
@@ -16,8 +16,6 @@struct xe_engine_ops ;struct xe_migrate ;struct xe_ring_ops ; -struct xe_ttm_gtt_mgr ; -struct xe_ttm_vram_mgr ;enum xe_gt_type {XE_GT_TYPE_UNINITIALIZED ,
@@ -108,8 +106,6 @@ struct xe_gt {enum xe_gt_type type;/** @id: id of GT */ u8 id; -/** @vram: id of the VRAM for this GT */ -u8 vram_id;/** @clock_freq: clock frequency */ u32 clock_freq;/** @engine_mask: mask of engines present on GT */
@@ -144,39 +140,6 @@ struct xe_gt {*/ struct xe_reg_sr reg_sr; -/** -* @mem: memory management info for GT, multiple GTs can point to same -* objects (virtual split) -*/ -struct { -/** -* @vram: VRAM info for GT, multiple GTs can point to same info -* (virtual split), can be subset of global device VRAM -*/ -struct { -/** @io_start: IO start address of this VRAM instance */ -resource_size_t io_start; -/** -* @io_size: IO size of this VRAM instance -* -* This represents how much of the VRAM the CPU can access -* via the VRAM BAR. -* This can be smaller than the actual @size, in which -* case only part of VRAM is CPU accessible (typically -* the first 256M). This configuration is known as small-bar. -*/ -resource_size_t io_size; -/** @base: offset of VRAM starting base */ -resource_size_t base; -/** @size: size of VRAM. */ -resource_size_t size; -/** @mapping: pointer to VRAM mappable space */ -void *__iomem mapping; - } vram; -/** @vram_mgr: VRAM TTM manager */ -struct xe_ttm_vram_mgr *vram_mgr; - } mem; -/** @reset: state for GT resets */ struct {/**
drivers/gpu/drm/xe/xe_irq.c +1 -1
@@ -369,7 +369,7 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg) }for_each_gt (gt, xe, id) { -if ((master_tile_ctl &DG1_MSTR_TILE (gt->info.vram_id)) ==0 ) +if ((master_tile_ctl &DG1_MSTR_TILE (gt_to_tile (gt)->id)) ==0 )continue ;if (!xe_gt_is_media_type (gt))
drivers/gpu/drm/xe/xe_mmio.c +26 -27
124 lines not on this page · raw message
drivers/gpu/drm/xe/xe_mmio.h +1 -1
@@ -144,6 +144,6 @@ static inline bool xe_mmio_in_range(const struct xe_mmio_range *range, }int xe_mmio_probe_vram (struct xe_device *xe); -int xe_mmio_tile_vram_size (struct xe_gt *gt,u64 *vram_size,u64 *tile_size,u64 *tile_base); +int xe_mmio_tile_vram_size (struct xe_tile *tile,u64 *vram_size,u64 *tile_size,u64 *tile_base);#endif
drivers/gpu/drm/xe/xe_pci.c +0 -2
@@ -568,7 +568,6 @@ static int xe_info_init(struct xe_device *xe,if (id ==0 ) { gt->info.type =XE_GT_TYPE_MAIN ; - gt->info.vram_id = id; gt->info.__engine_mask = graphics_desc->hw_engine_mask;if (MEDIA_VER (xe) <13 && media_desc)
@@ -578,7 +577,6 @@ static int xe_info_init(struct xe_device *xe, gt->mmio.adj_offset =0 ; }else { gt->info.type = desc->extra_gts[id -1 ].type; - gt->info.vram_id = desc->extra_gts[id -1 ].vram_id; gt->info.__engine_mask = (gt->info.type ==XE_GT_TYPE_MEDIA ) ? media_desc->hw_engine_mask : graphics_desc->hw_engine_mask;
drivers/gpu/drm/xe/xe_query.c +2 -2
@@ -182,7 +182,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query) config->num_params = num_params; config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID ] = xe->info.devid | (xe->info.revid <<16 ); -if (to_gt (xe)->mem.vram.size) +if (xe_device_get_root_tile (xe)->mem.vram.size) config->info[XE_QUERY_CONFIG_FLAGS ] =XE_QUERY_CONFIG_FLAGS_HAS_VRAM ;if (xe->info.enable_guc)
@@ -242,7 +242,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query) gts->gts[id].native_mem_regions =0x1 ; else gts->gts[id].native_mem_regions = -BIT (gt->info.vram_id) <<1 ; +BIT (gt_to_tile (gt)->id) <<1 ; gts->gts[id].slow_mem_regions = xe->info.mem_region_mask ^ gts->gts[id].native_mem_regions; }
drivers/gpu/drm/xe/xe_res_cursor.h +1 -1
@@ -53,7 +53,7 @@ static struct drm_buddy *xe_res_get_buddy(struct ttm_resource *res)struct xe_device *xe =ttm_to_xe_device (res->bo->bdev);if (res->mem_type !=XE_PL_STOLEN ) { -return &xe_device_get_gt (xe, res->mem_type -XE_PL_VRAM0 )->mem.vram_mgr->mm; +return &xe->tiles[res->mem_type -XE_PL_VRAM0 ].mem.vram_mgr->mm; }else {struct ttm_resource_manager *mgr =ttm_manager_type (&xe->ttm,XE_PL_STOLEN );
drivers/gpu/drm/xe/xe_tile.c +32 -1
@@ -29,6 +29,25 @@ int xe_tile_alloc(struct xe_tile *tile)return -ENOMEM ; tile->mem.ggtt->tile = tile; + tile->mem.vram_mgr =drmm_kzalloc (drm,sizeof (*tile->mem.vram_mgr),GFP_KERNEL ); +if (!tile->mem.vram_mgr) +return -ENOMEM ; + +return 0 ; +} + +static int tile_ttm_mgr_init (struct xe_tile *tile) +{ +struct xe_device *xe =tile_to_xe (tile); +int err; + +if (tile->mem.vram.size) { + err =xe_ttm_vram_mgr_init (tile, tile->mem.vram_mgr); +if (err) +return err; + xe->info.mem_region_mask |=BIT (tile->id) <<1 ; + } +return 0 ; }
@@ -48,5 +67,17 @@ int xe_tile_alloc(struct xe_tile *tile)*/ int xe_tile_init_noalloc (struct xe_tile *tile) { -return xe_ggtt_init_noalloc (tile->mem.ggtt); +int err; + +xe_device_mem_access_get (tile_to_xe (tile)); + + err =tile_ttm_mgr_init (tile); +if (err) + goto err_mem_access; + + err =xe_ggtt_init_noalloc (tile->mem.ggtt); + +err_mem_access: +xe_device_mem_access_put (tile_to_xe (tile)); +return err; }
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c +10 -8
@@ -51,29 +51,31 @@ bool xe_ttm_stolen_cpu_access_needs_ggtt(struct xe_device *xe)return GRAPHICS_VERx100 (xe) <1270 && !IS_DGFX (xe); } -static s64 detect_bar2_dgfx (struct xe_gt *gt,struct xe_ttm_stolen_mgr *mgr) +static s64 detect_bar2_dgfx (struct xe_device *xe,struct xe_ttm_stolen_mgr *mgr) { -struct pci_dev *pdev =to_pci_dev (gt_to_xe (gt)->drm.dev); +struct xe_tile *tile =xe_device_get_root_tile (xe); +struct xe_gt *mmio = &tile->primary_gt; +struct pci_dev *pdev =to_pci_dev (xe->drm.dev);u64 stolen_size;u64 tile_offset;u64 tile_size;u64 vram_size; -if (xe_mmio_tile_vram_size (gt, &vram_size, &tile_size, &tile_offset)) { -drm_err (>_to_xe (gt)->drm,"Querying total vram size failed\n" ); +if (xe_mmio_tile_vram_size (tile, &vram_size, &tile_size, &tile_offset)) { +drm_err (&xe->drm,"Querying total vram size failed\n" );return 0 ; }/* Use DSM base address instead for stolen memory */ - mgr->stolen_base = (xe_mmio_read64 (gt,DSMBASE ) &BDSM_MASK ) - tile_offset; -if (drm_WARN_ON (>_to_xe (gt)->drm, tile_size < mgr->stolen_base)) + mgr->stolen_base = (xe_mmio_read64 (mmio,DSMBASE ) &BDSM_MASK ) - tile_offset; +if (drm_WARN_ON (&xe->drm, tile_size < mgr->stolen_base))return 0 ; stolen_size = tile_size - mgr->stolen_base;/* Verify usage fits in the actual resource available */ if (mgr->stolen_base + stolen_size <=pci_resource_len (pdev,GEN12_LMEM_BAR )) - mgr->io_base = gt->mem.vram.io_start + mgr->stolen_base; + mgr->io_base = tile->mem.vram.io_start + mgr->stolen_base;/* * There may be few KB of platform dependent reserved memory at the end
@@ -141,7 +143,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)int err;if (IS_DGFX (xe)) - stolen_size =detect_bar2_dgfx (to_gt (xe), mgr); + stolen_size =detect_bar2_dgfx (xe, mgr);else if (GRAPHICS_VERx100 (xe) >=1270 ) stolen_size =detect_bar2_integrated (xe, mgr);else
drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +7 -9
@@ -353,16 +353,14 @@ int __xe_ttm_vram_mgr_init(struct xe_device *xe, struct xe_ttm_vram_mgr *mgr,return drmm_add_action_or_reset (&xe->drm, ttm_vram_mgr_fini, mgr); } -int xe_ttm_vram_mgr_init (struct xe_gt *gt,struct xe_ttm_vram_mgr *mgr) +int xe_ttm_vram_mgr_init (struct xe_tile *tile,struct xe_ttm_vram_mgr *mgr) { -struct xe_device *xe =gt_to_xe (gt); +struct xe_device *xe =tile_to_xe (tile); -XE_BUG_ON (xe_gt_is_media_type (gt)); + mgr->tile = tile; - mgr->gt = gt; - -return __xe_ttm_vram_mgr_init (xe, mgr,XE_PL_VRAM0 + gt->info.vram_id, - gt->mem.vram.size, gt->mem.vram.io_size, +return __xe_ttm_vram_mgr_init (xe, mgr,XE_PL_VRAM0 + tile->id, + tile->mem.vram.size, tile->mem.vram.io_size,PAGE_SIZE ); }
@@ -373,7 +371,7 @@ int xe_ttm_vram_mgr_alloc_sgt(struct xe_device *xe,enum dma_data_direction dir, struct sg_table **sgt) { - struct xe_gt *gt = xe_device_get_gt(xe, res->mem_type - XE_PL_VRAM0); + struct xe_tile *tile = &xe->tiles[res->mem_type - XE_PL_VRAM0];struct xe_res_cursor cursor;struct scatterlist *sg;int num_entries =0 ;
@@ -406,7 +404,7 @@ int xe_ttm_vram_mgr_alloc_sgt(struct xe_device *xe,*/ xe_res_first (res, offset, length, &cursor);for_each_sgtable_sg ((*sgt), sg, i) { -phys_addr_t phys = cursor.start + gt->mem.vram.io_start; +phys_addr_t phys = cursor.start + tile->mem.vram.io_start;size_t size = cursor.size;dma_addr_t addr;
drivers/gpu/drm/xe/xe_ttm_vram_mgr.h +2 -2
@@ -10,12 +10,12 @@enum dma_data_direction ;struct xe_device ; -struct xe_gt ; +struct xe_tile ;int __xe_ttm_vram_mgr_init (struct xe_device *xe,struct xe_ttm_vram_mgr *mgr,u32 mem_type,u64 size,u64 io_size,u64 default_page_size); -int xe_ttm_vram_mgr_init (struct xe_gt *gt,struct xe_ttm_vram_mgr *mgr); +int xe_ttm_vram_mgr_init (struct xe_tile *tile,struct xe_ttm_vram_mgr *mgr); int xe_ttm_vram_mgr_alloc_sgt(struct xe_device *xe, struct ttm_resource *res, u64 offset, u64 length,
drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h +3 -3
@@ -9,7 +9,7 @@#include <drm/drm_buddy.h> #include <drm/ttm/ttm_device.h> -struct xe_gt ; +struct xe_tile ;/** * struct xe_ttm_vram_mgr - XE TTM VRAM manager
@@ -17,8 +17,8 @@ struct xe_gt;* Manages placement of TTM resource in VRAM. */ struct xe_ttm_vram_mgr { -/** @gt: Graphics tile which the VRAM belongs to */ -struct xe_gt *gt; +/** @tile: Tile which the VRAM belongs to */ +struct xe_tile *tile;/** @manager: Base TTM resource manager */ struct ttm_resource_manager manager;/** @mm: DRM buddy allocator which manages the VRAM */
Signature · 1 line
2.40.1
PATCH 10/31 drm/xe: Move VRAM from GT to tile
In reply to a message not in the archiveOn platforms with VRAM, the VRAM is associated with the tile, not the GT.
v2:
- Unsquash the GGTT handling back into its own patch.
- Fix kunit test build
v3:
- Tweak the "FIXME" comment to clarify that this function will be completely gone by the end of the series. (Lucas)
v4:
- Move a few changes that were supposed to be part of the GGTT patch back to that commit. (Gustavo)
v5:
- Kerneldoc parameter name fix.
--- drivers/gpu/drm/xe/tests/xe_bo.c | 6 +- drivers/gpu/drm/xe/xe_bo.c | 44 ++++++------ drivers/gpu/drm/xe/xe_bo.h | 4 +- drivers/gpu/drm/xe/xe_device.c | 4 -- drivers/gpu/drm/xe/xe_device_types.h | 30 ++++++++ drivers/gpu/drm/xe/xe_gt.c | 82 ++-------------------- drivers/gpu/drm/xe/xe_gt.h | 1 - drivers/gpu/drm/xe/xe_gt_pagefault.c | 6 +- drivers/gpu/drm/xe/xe_gt_types.h | 37 ---------- drivers/gpu/drm/xe/xe_irq.c | 2 +- drivers/gpu/drm/xe/xe_mmio.c | 53 +++++++------- drivers/gpu/drm/xe/xe_mmio.h | 2 +- drivers/gpu/drm/xe/xe_pci.c | 2 - drivers/gpu/drm/xe/xe_query.c | 4 +- drivers/gpu/drm/xe/xe_res_cursor.h | 2 +- drivers/gpu/drm/xe/xe_tile.c | 33 ++++++++- drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 18 ++--- drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 16 ++--- drivers/gpu/drm/xe/xe_ttm_vram_mgr.h | 4 +- drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 6 +- 20 files changed, 151 insertions(+), 205 deletions(-)
drivers/gpu/drm/xe/tests/xe_bo.c +3 -3
@@ -115,9 +115,9 @@ static void ccs_test_run_gt(struct xe_device *xe, struct xe_gt *gt,int ret;/* TODO: Sanity check */ - vram_bit =XE_BO_CREATE_VRAM0_BIT << gt->info.vram_id; + vram_bit =XE_BO_CREATE_VRAM0_BIT <<gt_to_tile (gt)->id;kunit_info (test,"Testing gt id %u vram id %u\n" , gt->info.id, - gt->info.vram_id); +gt_to_tile (gt)->id); bo =xe_bo_create_locked (xe,NULL ,NULL ,SZ_1M , ttm_bo_type_device, vram_bit);
@@ -179,7 +179,7 @@ static int evict_test_run_gt(struct xe_device *xe, struct xe_gt *gt, struct kuniint err, i;kunit_info (test,"Testing device %s gt id %u vram id %u\n" , -dev_name (xe->drm.dev), gt->info.id, gt->info.vram_id); +dev_name (xe->drm.dev), gt->info.id,gt_to_tile (gt)->id);for (i =0 ; i <2 ; ++i) {xe_vm_lock (vm, &ww,0 , false);
drivers/gpu/drm/xe/xe_bo.c +22 -22
120 lines not on this page · raw message
drivers/gpu/drm/xe/xe_bo.h +2 -2
@@ -22,7 +22,7 @@/* -- */ #define XE_BO_CREATE_STOLEN_BIT BIT(4)#define XE_BO_CREATE_VRAM_IF_DGFX (gt) \ - (IS_DGFX(gt_to_xe(gt)) ? XE_BO_CREATE_VRAM0_BIT << gt->info.vram_id : \ + (IS_DGFX(gt_to_xe(gt)) ? XE_BO_CREATE_VRAM0_BIT << gt_to_tile(gt)->id : \ XE_BO_CREATE_SYSTEM_BIT)#define XE_BO_CREATE_GGTT_BIT BIT(5)#define XE_BO_CREATE_IGNORE_MIN_PAGE_SIZE_BIT BIT(6)
@@ -108,7 +108,7 @@ struct xe_bo *xe_bo_create_from_data(struct xe_device *xe, struct xe_gt *gt,int xe_bo_placement_for_flags (struct xe_device *xe,struct xe_bo *bo,u32 bo_flags); -struct xe_gt *xe_bo_to_gt (struct xe_bo *bo); +struct xe_tile *xe_bo_to_tile (struct xe_bo *bo);static inline struct xe_bo *ttm_to_xe_bo (const struct ttm_buffer_object *bo) {
drivers/gpu/drm/xe/xe_device.c +0 -4
@@ -299,10 +299,6 @@ int xe_device_probe(struct xe_device *xe) err =xe_tile_init_noalloc (tile);if (err) goto err_irq_shutdown; - - err =xe_gt_init_noalloc (&tile->primary_gt); -if (err) - goto err_irq_shutdown; }/* Allocate and map stolen after potential VRAM resize */
drivers/gpu/drm/xe/xe_device_types.h +30 -0
@@ -102,6 +102,36 @@ struct xe_tile {/** @mem: memory management info for tile */ struct { +/** +* @vram: VRAM info for tile. +* +* Although VRAM is associated with a specific tile, it can +* still be accessed by all tiles' GTs. +*/ +struct { +/** @io_start: IO start address of this VRAM instance */ +resource_size_t io_start; +/** +* @io_size: IO size of this VRAM instance +* +* This represents how much of this VRAM we can access +* via the CPU through the VRAM BAR. This can be smaller +* than @size, in which case only part of VRAM is CPU +* accessible (typically the first 256M). This +* configuration is known as small-bar. +*/ +resource_size_t io_size; +/** @base: offset of VRAM starting base */ +resource_size_t base; +/** @size: size of VRAM. */ +resource_size_t size; +/** @mapping: pointer to VRAM mappable space */ +void *__iomem mapping; + } vram; + +/** @vram_mgr: VRAM TTM manager */ +struct xe_ttm_vram_mgr *vram_mgr; +/** @ggtt: Global graphics translation table */ struct xe_ggtt *ggtt; } mem;
drivers/gpu/drm/xe/xe_gt.c +5 -77
111 lines not on this page · raw message
drivers/gpu/drm/xe/xe_gt.h +0 -1
@@ -18,7 +18,6 @@int xe_gt_alloc (struct xe_device *xe,struct xe_gt *gt);int xe_gt_init_early (struct xe_gt *gt); -int xe_gt_init_noalloc (struct xe_gt *gt);int xe_gt_init (struct xe_gt *gt);int xe_gt_record_default_lrcs (struct xe_gt *gt);void xe_gt_suspend_prepare (struct xe_gt *gt);
drivers/gpu/drm/xe/xe_gt_pagefault.c +4 -2
@@ -107,6 +107,7 @@ static struct xe_vma *lookup_vma(struct xe_vm *vm, u64 page_addr)static int handle_pagefault (struct xe_gt *gt,struct pagefault *pf) {struct xe_device *xe =gt_to_xe (gt); +struct xe_tile *tile =gt_to_tile (gt);struct xe_vm *vm;struct xe_vma *vma =NULL ;struct xe_bo *bo;
@@ -195,7 +196,7 @@ static int handle_pagefault(struct xe_gt *gt, struct pagefault *pf) }/* Migrate to VRAM, move should invalidate the VMA first */ - ret =xe_bo_migrate (bo,XE_PL_VRAM0 + gt->info.vram_id); + ret =xe_bo_migrate (bo,XE_PL_VRAM0 + tile->id);if (ret) goto unlock_dma_resv; }else if (bo) {
@@ -498,6 +499,7 @@ static struct xe_vma *get_acc_vma(struct xe_vm *vm, struct acc *acc)static int handle_acc (struct xe_gt *gt,struct acc *acc) {struct xe_device *xe =gt_to_xe (gt); +struct xe_tile *tile =gt_to_tile (gt);struct xe_vm *vm;struct xe_vma *vma;struct xe_bo *bo;
@@ -553,7 +555,7 @@ static int handle_acc(struct xe_gt *gt, struct acc *acc) goto unlock_vm;/* Migrate to VRAM, move should invalidate the VMA first */ - ret =xe_bo_migrate (bo,XE_PL_VRAM0 + gt->info.vram_id); + ret =xe_bo_migrate (bo,XE_PL_VRAM0 + tile->id);if (only_needs_bo_lock (bo))xe_bo_unlock (bo, &ww);
drivers/gpu/drm/xe/xe_gt_types.h +0 -37
@@ -16,8 +16,6 @@struct xe_engine_ops ;struct xe_migrate ;struct xe_ring_ops ; -struct xe_ttm_gtt_mgr ; -struct xe_ttm_vram_mgr ;enum xe_gt_type {XE_GT_TYPE_UNINITIALIZED ,
@@ -108,8 +106,6 @@ struct xe_gt {enum xe_gt_type type;/** @id: id of GT */ u8 id; -/** @vram: id of the VRAM for this GT */ -u8 vram_id;/** @clock_freq: clock frequency */ u32 clock_freq;/** @engine_mask: mask of engines present on GT */
@@ -144,39 +140,6 @@ struct xe_gt {*/ struct xe_reg_sr reg_sr; -/** -* @mem: memory management info for GT, multiple GTs can point to same -* objects (virtual split) -*/ -struct { -/** -* @vram: VRAM info for GT, multiple GTs can point to same info -* (virtual split), can be subset of global device VRAM -*/ -struct { -/** @io_start: IO start address of this VRAM instance */ -resource_size_t io_start; -/** -* @io_size: IO size of this VRAM instance -* -* This represents how much of the VRAM the CPU can access -* via the VRAM BAR. -* This can be smaller than the actual @size, in which -* case only part of VRAM is CPU accessible (typically -* the first 256M). This configuration is known as small-bar. -*/ -resource_size_t io_size; -/** @base: offset of VRAM starting base */ -resource_size_t base; -/** @size: size of VRAM. */ -resource_size_t size; -/** @mapping: pointer to VRAM mappable space */ -void *__iomem mapping; - } vram; -/** @vram_mgr: VRAM TTM manager */ -struct xe_ttm_vram_mgr *vram_mgr; - } mem; -/** @reset: state for GT resets */ struct {/**
drivers/gpu/drm/xe/xe_irq.c +1 -1
@@ -369,7 +369,7 @@ static irqreturn_t dg1_irq_handler(int irq, void *arg) }for_each_gt (gt, xe, id) { -if ((master_tile_ctl &DG1_MSTR_TILE (gt->info.vram_id)) ==0 ) +if ((master_tile_ctl &DG1_MSTR_TILE (gt_to_tile (gt)->id)) ==0 )continue ;if (!xe_gt_is_media_type (gt))
drivers/gpu/drm/xe/xe_mmio.c +26 -27
124 lines not on this page · raw message
drivers/gpu/drm/xe/xe_mmio.h +1 -1
@@ -144,6 +144,6 @@ static inline bool xe_mmio_in_range(const struct xe_mmio_range *range, }int xe_mmio_probe_vram (struct xe_device *xe); -int xe_mmio_tile_vram_size (struct xe_gt *gt,u64 *vram_size,u64 *tile_size,u64 *tile_base); +int xe_mmio_tile_vram_size (struct xe_tile *tile,u64 *vram_size,u64 *tile_size,u64 *tile_base);#endif
drivers/gpu/drm/xe/xe_pci.c +0 -2
@@ -568,7 +568,6 @@ static int xe_info_init(struct xe_device *xe,if (id ==0 ) { gt->info.type =XE_GT_TYPE_MAIN ; - gt->info.vram_id = id; gt->info.__engine_mask = graphics_desc->hw_engine_mask;if (MEDIA_VER (xe) <13 && media_desc)
@@ -578,7 +577,6 @@ static int xe_info_init(struct xe_device *xe, gt->mmio.adj_offset =0 ; }else { gt->info.type = desc->extra_gts[id -1 ].type; - gt->info.vram_id = desc->extra_gts[id -1 ].vram_id; gt->info.__engine_mask = (gt->info.type ==XE_GT_TYPE_MEDIA ) ? media_desc->hw_engine_mask : graphics_desc->hw_engine_mask;
drivers/gpu/drm/xe/xe_query.c +2 -2
@@ -182,7 +182,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query) config->num_params = num_params; config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID ] = xe->info.devid | (xe->info.revid <<16 ); -if (to_gt (xe)->mem.vram.size) +if (xe_device_get_root_tile (xe)->mem.vram.size) config->info[XE_QUERY_CONFIG_FLAGS ] =XE_QUERY_CONFIG_FLAGS_HAS_VRAM ;if (xe->info.enable_guc)
@@ -242,7 +242,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query) gts->gts[id].native_mem_regions =0x1 ; else gts->gts[id].native_mem_regions = -BIT (gt->info.vram_id) <<1 ; +BIT (gt_to_tile (gt)->id) <<1 ; gts->gts[id].slow_mem_regions = xe->info.mem_region_mask ^ gts->gts[id].native_mem_regions; }
drivers/gpu/drm/xe/xe_res_cursor.h +1 -1
@@ -53,7 +53,7 @@ static struct drm_buddy *xe_res_get_buddy(struct ttm_resource *res)struct xe_device *xe =ttm_to_xe_device (res->bo->bdev);if (res->mem_type !=XE_PL_STOLEN ) { -return &xe_device_get_gt (xe, res->mem_type -XE_PL_VRAM0 )->mem.vram_mgr->mm; +return &xe->tiles[res->mem_type -XE_PL_VRAM0 ].mem.vram_mgr->mm; }else {struct ttm_resource_manager *mgr =ttm_manager_type (&xe->ttm,XE_PL_STOLEN );
drivers/gpu/drm/xe/xe_tile.c +32 -1
@@ -29,6 +29,25 @@ int xe_tile_alloc(struct xe_tile *tile)return -ENOMEM ; tile->mem.ggtt->tile = tile; + tile->mem.vram_mgr =drmm_kzalloc (drm,sizeof (*tile->mem.vram_mgr),GFP_KERNEL ); +if (!tile->mem.vram_mgr) +return -ENOMEM ; + +return 0 ; +} + +static int tile_ttm_mgr_init (struct xe_tile *tile) +{ +struct xe_device *xe =tile_to_xe (tile); +int err; + +if (tile->mem.vram.size) { + err =xe_ttm_vram_mgr_init (tile, tile->mem.vram_mgr); +if (err) +return err; + xe->info.mem_region_mask |=BIT (tile->id) <<1 ; + } +return 0 ; }
@@ -48,5 +67,17 @@ int xe_tile_alloc(struct xe_tile *tile)*/ int xe_tile_init_noalloc (struct xe_tile *tile) { -return xe_ggtt_init_noalloc (tile->mem.ggtt); +int err; + +xe_device_mem_access_get (tile_to_xe (tile)); + + err =tile_ttm_mgr_init (tile); +if (err) + goto err_mem_access; + + err =xe_ggtt_init_noalloc (tile->mem.ggtt); + +err_mem_access: +xe_device_mem_access_put (tile_to_xe (tile)); +return err; }
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c +10 -8
@@ -51,29 +51,31 @@ bool xe_ttm_stolen_cpu_access_needs_ggtt(struct xe_device *xe)return GRAPHICS_VERx100 (xe) <1270 && !IS_DGFX (xe); } -static s64 detect_bar2_dgfx (struct xe_gt *gt,struct xe_ttm_stolen_mgr *mgr) +static s64 detect_bar2_dgfx (struct xe_device *xe,struct xe_ttm_stolen_mgr *mgr) { -struct pci_dev *pdev =to_pci_dev (gt_to_xe (gt)->drm.dev); +struct xe_tile *tile =xe_device_get_root_tile (xe); +struct xe_gt *mmio = &tile->primary_gt; +struct pci_dev *pdev =to_pci_dev (xe->drm.dev);u64 stolen_size;u64 tile_offset;u64 tile_size;u64 vram_size; -if (xe_mmio_tile_vram_size (gt, &vram_size, &tile_size, &tile_offset)) { -drm_err (>_to_xe (gt)->drm,"Querying total vram size failed\n" ); +if (xe_mmio_tile_vram_size (tile, &vram_size, &tile_size, &tile_offset)) { +drm_err (&xe->drm,"Querying total vram size failed\n" );return 0 ; }/* Use DSM base address instead for stolen memory */ - mgr->stolen_base = (xe_mmio_read64 (gt,DSMBASE ) &BDSM_MASK ) - tile_offset; -if (drm_WARN_ON (>_to_xe (gt)->drm, tile_size < mgr->stolen_base)) + mgr->stolen_base = (xe_mmio_read64 (mmio,DSMBASE ) &BDSM_MASK ) - tile_offset; +if (drm_WARN_ON (&xe->drm, tile_size < mgr->stolen_base))return 0 ; stolen_size = tile_size - mgr->stolen_base;/* Verify usage fits in the actual resource available */ if (mgr->stolen_base + stolen_size <=pci_resource_len (pdev,GEN12_LMEM_BAR )) - mgr->io_base = gt->mem.vram.io_start + mgr->stolen_base; + mgr->io_base = tile->mem.vram.io_start + mgr->stolen_base;/* * There may be few KB of platform dependent reserved memory at the end
@@ -141,7 +143,7 @@ void xe_ttm_stolen_mgr_init(struct xe_device *xe)int err;if (IS_DGFX (xe)) - stolen_size =detect_bar2_dgfx (to_gt (xe), mgr); + stolen_size =detect_bar2_dgfx (xe, mgr);else if (GRAPHICS_VERx100 (xe) >=1270 ) stolen_size =detect_bar2_integrated (xe, mgr);else
drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +7 -9
@@ -353,16 +353,14 @@ int __xe_ttm_vram_mgr_init(struct xe_device *xe, struct xe_ttm_vram_mgr *mgr,return drmm_add_action_or_reset (&xe->drm, ttm_vram_mgr_fini, mgr); } -int xe_ttm_vram_mgr_init (struct xe_gt *gt,struct xe_ttm_vram_mgr *mgr) +int xe_ttm_vram_mgr_init (struct xe_tile *tile,struct xe_ttm_vram_mgr *mgr) { -struct xe_device *xe =gt_to_xe (gt); +struct xe_device *xe =tile_to_xe (tile); -XE_BUG_ON (xe_gt_is_media_type (gt)); + mgr->tile = tile; - mgr->gt = gt; - -return __xe_ttm_vram_mgr_init (xe, mgr,XE_PL_VRAM0 + gt->info.vram_id, - gt->mem.vram.size, gt->mem.vram.io_size, +return __xe_ttm_vram_mgr_init (xe, mgr,XE_PL_VRAM0 + tile->id, + tile->mem.vram.size, tile->mem.vram.io_size,PAGE_SIZE ); }
@@ -373,7 +371,7 @@ int xe_ttm_vram_mgr_alloc_sgt(struct xe_device *xe,enum dma_data_direction dir, struct sg_table **sgt) { - struct xe_gt *gt = xe_device_get_gt(xe, res->mem_type - XE_PL_VRAM0); + struct xe_tile *tile = &xe->tiles[res->mem_type - XE_PL_VRAM0];struct xe_res_cursor cursor;struct scatterlist *sg;int num_entries =0 ;
@@ -406,7 +404,7 @@ int xe_ttm_vram_mgr_alloc_sgt(struct xe_device *xe,*/ xe_res_first (res, offset, length, &cursor);for_each_sgtable_sg ((*sgt), sg, i) { -phys_addr_t phys = cursor.start + gt->mem.vram.io_start; +phys_addr_t phys = cursor.start + tile->mem.vram.io_start;size_t size = cursor.size;dma_addr_t addr;
drivers/gpu/drm/xe/xe_ttm_vram_mgr.h +2 -2
@@ -10,12 +10,12 @@enum dma_data_direction ;struct xe_device ; -struct xe_gt ; +struct xe_tile ;int __xe_ttm_vram_mgr_init (struct xe_device *xe,struct xe_ttm_vram_mgr *mgr,u32 mem_type,u64 size,u64 io_size,u64 default_page_size); -int xe_ttm_vram_mgr_init (struct xe_gt *gt,struct xe_ttm_vram_mgr *mgr); +int xe_ttm_vram_mgr_init (struct xe_tile *tile,struct xe_ttm_vram_mgr *mgr); int xe_ttm_vram_mgr_alloc_sgt(struct xe_device *xe, struct ttm_resource *res, u64 offset, u64 length,
drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h +3 -3
@@ -9,7 +9,7 @@#include <drm/drm_buddy.h> #include <drm/ttm/ttm_device.h> -struct xe_gt ; +struct xe_tile ;/** * struct xe_ttm_vram_mgr - XE TTM VRAM manager
@@ -17,8 +17,8 @@ struct xe_gt;* Manages placement of TTM resource in VRAM. */ struct xe_ttm_vram_mgr { -/** @gt: Graphics tile which the VRAM belongs to */ -struct xe_gt *gt; +/** @tile: Tile which the VRAM belongs to */ +struct xe_tile *tile;/** @manager: Base TTM resource manager */ struct ttm_resource_manager manager;/** @mm: DRM buddy allocator which manages the VRAM */
Signature · 1 line
2.40.1