diff options
| author | Matthew Auld <matthew.auld@intel.com> | 2023-03-08 15:30:08 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:29:45 +0300 |
| commit | 2a8477f7614a62b41b034e3eaf017d41e8a58ce9 (patch) | |
| tree | 12a231e189347f8dc3f43663e9b29fbd6a867016 /drivers/gpu/drm/xe/xe_pt.c | |
| parent | 39fd0b4507c3ba86ef04827208dd3aa85d2d796e (diff) | |
| download | linux-2a8477f7614a62b41b034e3eaf017d41e8a58ce9.tar.xz | |
drm/xe: s/lmem/vram/
This seems to be the preferred nomenclature in xe. Currently we are
intermixing vram and lmem, which is confusing.
v2 (Gwan-gyeong Mun & Lucas):
- Rather apply to the entire driver
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_pt.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_pt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c index 00d9fff53828..64da98152455 100644 --- a/drivers/gpu/drm/xe/xe_pt.c +++ b/drivers/gpu/drm/xe/xe_pt.c @@ -61,12 +61,12 @@ u64 gen8_pde_encode(struct xe_bo *bo, u64 bo_offset, const enum xe_cache_level level) { u64 pde; - bool is_lmem; + bool is_vram; - pde = xe_bo_addr(bo, bo_offset, GEN8_PAGE_SIZE, &is_lmem); + pde = xe_bo_addr(bo, bo_offset, GEN8_PAGE_SIZE, &is_vram); pde |= GEN8_PAGE_PRESENT | GEN8_PAGE_RW; - XE_WARN_ON(IS_DGFX(xe_bo_device(bo)) && !is_lmem); + XE_WARN_ON(IS_DGFX(xe_bo_device(bo)) && !is_vram); /* FIXME: I don't think the PPAT handling is correct for MTL */ @@ -79,13 +79,13 @@ u64 gen8_pde_encode(struct xe_bo *bo, u64 bo_offset, } static dma_addr_t vma_addr(struct xe_vma *vma, u64 offset, - size_t page_size, bool *is_lmem) + size_t page_size, bool *is_vram) { if (xe_vma_is_userptr(vma)) { struct xe_res_cursor cur; u64 page; - *is_lmem = false; + *is_vram = false; page = offset >> PAGE_SHIFT; offset &= (PAGE_SIZE - 1); @@ -93,7 +93,7 @@ static dma_addr_t vma_addr(struct xe_vma *vma, u64 offset, &cur); return xe_res_dma(&cur) + offset; } else { - return xe_bo_addr(vma->bo, offset, page_size, is_lmem); + return xe_bo_addr(vma->bo, offset, page_size, is_vram); } } |