github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 04:34:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

- Check no-DMA huge-pte cases before DMA segment test (Himal)

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEbSBwaO7dZQkcLOKj+mJfZA7rE8oFAmprZMoACgkQ+mJfZA7r
 E8pUKwgAk9FQ+qxUURU0LavaKPaD36VO+XDwswtSnzIV8qd4/vyhZAWJXnJ1cdjo
 c5CB9PVrFMEIptEBu7GOGqDvczsnrdNPF1BihMw6xI587++FXr/lv5FoO/xgo0HM
 c4FGkyymSsm6Y9TtGGbdKqiBbTh7cArYoJ8N5ElQMjxkCpE+XQMDtAmA/z2TTyNX
 JP1VdFS+8PvhEvSSCrVbMPRm0BwGhYVSaiBXZjsjkG4k035bR+SyCJ/+8j5PB6j8
 RR5cNaznvIucRTtAQ8puAuz9PMlnwXfkJ4hfMW8IpTuNqIh80vLMRbuTyoN5WMbt
 JSwUtFv1w0plLAzed5yhmVLzw48WmQ==
 =zcFI
 -----END PGP SIGNATURE-----

Merge tag 'drm-xe-fixes-2026-07-30' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes

- Check no-DMA huge-pte cases before DMA segment test (Himal)

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/amtk7ZddR12dgg-A@intel.com
This commit is contained in:
Dave Airlie 2026-07-31 14:43:02 +10:00
commit efbac20ac4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/xe/xe_pt.c
View File

@ -443,10 +443,6 @@ static bool xe_pt_hugepte_possible(u64 addr, u64 next, unsigned int level,
if (!xe_pt_covers(addr, next, level, &xe_walk->base))
return false;
/* Does the DMA segment cover the whole pte? */
if (next - xe_walk->va_curs_start > xe_walk->curs->size)
return false;
/* null VMA's and purged BO's do not have dma addresses */
if (xe_vma_is_null(xe_walk->vma) || (bo && xe_bo_is_purged(bo)))
return true;
@ -455,6 +451,10 @@ static bool xe_pt_hugepte_possible(u64 addr, u64 next, unsigned int level,
if (xe_walk->clear_pt)
return true;
/* Does the DMA segment cover the whole pte? */
if (next - xe_walk->va_curs_start > xe_walk->curs->size)
return false;
/* Is the DMA address huge PTE size aligned? */
size = next - addr;
dma = addr - xe_walk->va_curs_start + xe_res_dma(xe_walk->curs);
@ -775,8 +775,11 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma,
}
xe_walk.needs_64K = (vm->flags & XE_VM_FLAG_64K);
if (clear_pt)
if (clear_pt) {
xe_assert(xe, !range);
curs.size = xe_vma_size(vma);
goto walk_pt;
}
if (vma->gpuva.flags & XE_VMA_ATOMIC_PTE_BIT) {
xe_walk.default_vram_pte = xe_atomic_for_vram(vm, vma) ? XE_USM_PPGTT_PTE_AE : 0;