iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe: Fix MTL+ stolen memory mapping

Browse Source 
Based on commit 8d8d062be6b9 ("drm/i915/mtl: Fix MTL stolen memory GGTT
mapping"). For stolen on MTL and beyond, the address in the PTE is the
offset from DSM base. While at it, update the comments explaining each
part of the calculation.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230726160708.3967790-9-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Lucas De Marchi 2023-07-26 09:07:06 -07:00 committed by Rodrigo Vivi
parent b23ebae7ab
commit 58052eb70c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c
View File

@ -94,11 +94,22 @@ static u32 detect_bar2_integrated(struct xe_device *xe, struct xe_ttm_stolen_mgr
ggc = xe_mmio_read32(xe_root_mmio_gt(xe), GGC);
/* check GGMS, should be fixed 0x3 (8MB) */
/*
* Check GGMS: it should be fixed 0x3 (8MB), which corresponds to the
* GTT size
*/
if (drm_WARN_ON(&xe->drm, (ggc & GGMS_MASK) != GGMS_MASK))
return 0;
mgr->stolen_base = mgr->io_base = pci_resource_start(pdev, 2) + SZ_8M;
/*
* Graphics >= 1270 uses the offset to the GSMBASE as address in the
* PTEs, together with the DM flag being set. Previously there was no
* such flag so the address was the io_base.
*
* DSMBASE = GSMBASE + 8MB
*/
mgr->stolen_base = SZ_8M;
mgr->io_base = pci_resource_start(pdev, 2) + mgr->stolen_base;
/* return valid GMS value, -EIO if invalid */
gms = REG_FIELD_GET(GMS_MASK, ggc);