[Intel-xe] [PATCH] drm/xe: Prevent null ptr dereference

Pallavi Mishra pallavi.mishra at intel.com
Fri Nov 3 21:19:24 UTC 2023


In scenarios where vm is not initialized, use xe_migrate
to get the address.

Signed-off-by: Pallavi Mishra <pallavi.mishra at intel.com>
---
 drivers/gpu/drm/xe/xe_migrate.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index e6a31f90ebdb..f79ec8e4ae4e 100644
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -1296,7 +1296,10 @@ xe_migrate_update_pgtables(struct xe_migrate *m,
 
 			xe_tile_assert(tile, pt_bo->size == SZ_4K);
 
-			addr = vm->pt_ops->pte_encode_bo(pt_bo, 0, pat_index, 0);
+			if (vm)
+				addr = vm->pt_ops->pte_encode_bo(pt_bo, 0, pat_index, 0);
+			else
+				addr = m->q->vm->pt_ops->pte_encode_bo(pt_bo, 0, pat_index, 0);
 			bb->cs[bb->len++] = lower_32_bits(addr);
 			bb->cs[bb->len++] = upper_32_bits(addr);
 		}
-- 
2.25.1



More information about the Intel-xe mailing list