Skip to content

Commit 11bbe0d

Browse files
Thomas Hellströmmbrost05
authored andcommitted
drm/xe: Add drm_pagemap ops to SVM
Add support for mapping device pages to Xe SVM by attaching drm_pagemap to a memory region, which is then linked to a GPU SVM devmem allocation. This enables GPU SVM to derive the device page address. v3: - Better commit message (Thomas) - New drm_pagemap.h location v5: - s/xe_mem_region/xe_vram_region (Rebase) Signed-off-by: Matthew Brost <[email protected]> Signed-off-by: Thomas Hellström <[email protected]> Reviewed-by: Matthew Brost <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 808c37e commit 11bbe0d

File tree

2 files changed

+63
-0
lines changed

2 files changed

+63
-0
lines changed

drivers/gpu/drm/xe/xe_device_types.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <drm/drm_device.h>
1212
#include <drm/drm_file.h>
13+
#include <drm/drm_pagemap.h>
1314
#include <drm/ttm/ttm_device.h>
1415

1516
#include "xe_devcoredump_types.h"
@@ -108,6 +109,11 @@ struct xe_vram_region {
108109
void __iomem *mapping;
109110
/** @pagemap: Used to remap device memory as ZONE_DEVICE */
110111
struct dev_pagemap pagemap;
112+
/**
113+
* @dpagemap: The struct drm_pagemap of the ZONE_DEVICE memory
114+
* pages of this tile.
115+
*/
116+
struct drm_pagemap dpagemap;
111117
/**
112118
* @hpa_base: base host physical address
113119
*

drivers/gpu/drm/xe/xe_svm.c

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,33 @@ static void xe_svm_garbage_collector_work_func(struct work_struct *w)
288288
up_write(&vm->lock);
289289
}
290290

291+
static struct xe_vram_region *page_to_vr(struct page *page)
292+
{
293+
return container_of(page->pgmap, struct xe_vram_region, pagemap);
294+
}
295+
296+
static struct xe_tile *vr_to_tile(struct xe_vram_region *vr)
297+
{
298+
return container_of(vr, struct xe_tile, mem.vram);
299+
}
300+
301+
static u64 xe_vram_region_page_to_dpa(struct xe_vram_region *vr,
302+
struct page *page)
303+
{
304+
u64 dpa;
305+
struct xe_tile *tile = vr_to_tile(vr);
306+
u64 pfn = page_to_pfn(page);
307+
u64 offset;
308+
309+
xe_tile_assert(tile, is_device_private_page(page));
310+
xe_tile_assert(tile, (pfn << PAGE_SHIFT) >= vr->hpa_base);
311+
312+
offset = (pfn << PAGE_SHIFT) - vr->hpa_base;
313+
dpa = vr->dpa_base + offset;
314+
315+
return dpa;
316+
}
317+
291318
static const struct drm_gpusvm_ops gpusvm_ops = {
292319
.range_alloc = xe_svm_range_alloc,
293320
.range_free = xe_svm_range_free,
@@ -456,6 +483,32 @@ bool xe_svm_has_mapping(struct xe_vm *vm, u64 start, u64 end)
456483
}
457484

458485
#if IS_ENABLED(CONFIG_DRM_XE_DEVMEM_MIRROR)
486+
static struct drm_pagemap_device_addr
487+
xe_drm_pagemap_device_map(struct drm_pagemap *dpagemap,
488+
struct device *dev,
489+
struct page *page,
490+
unsigned int order,
491+
enum dma_data_direction dir)
492+
{
493+
struct device *pgmap_dev = dpagemap->dev;
494+
enum drm_interconnect_protocol prot;
495+
dma_addr_t addr;
496+
497+
if (pgmap_dev == dev) {
498+
addr = xe_vram_region_page_to_dpa(page_to_vr(page), page);
499+
prot = XE_INTERCONNECT_VRAM;
500+
} else {
501+
addr = DMA_MAPPING_ERROR;
502+
prot = 0;
503+
}
504+
505+
return drm_pagemap_device_addr_encode(addr, prot, order, dir);
506+
}
507+
508+
static const struct drm_pagemap_ops xe_drm_pagemap_ops = {
509+
.device_map = xe_drm_pagemap_device_map,
510+
};
511+
459512
/**
460513
* xe_devm_add: Remap and provide memmap backing for device memory
461514
* @tile: tile that the memory region belongs to
@@ -488,6 +541,10 @@ int xe_devm_add(struct xe_tile *tile, struct xe_vram_region *vr)
488541
vr->pagemap.ops = drm_gpusvm_pagemap_ops_get();
489542
vr->pagemap.owner = xe_svm_devm_owner(xe);
490543
addr = devm_memremap_pages(dev, &vr->pagemap);
544+
545+
vr->dpagemap.dev = dev;
546+
vr->dpagemap.ops = &xe_drm_pagemap_ops;
547+
491548
if (IS_ERR(addr)) {
492549
devm_release_mem_region(dev, res->start, resource_size(res));
493550
ret = PTR_ERR(addr);

0 commit comments

Comments
 (0)