Commit 857912c3 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi

drm/xe: Fix some log messages on 32b

Either use the proper format or cast up to 64b depending on the case.
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 4aa18ae4
...@@ -263,9 +263,9 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test) ...@@ -263,9 +263,9 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test)
goto free_tiny; goto free_tiny;
} }
kunit_info(test, "Starting tests, top level PT addr: %llx, special pagetable base addr: %llx\n", kunit_info(test, "Starting tests, top level PT addr: %lx, special pagetable base addr: %lx\n",
xe_bo_main_addr(m->eng->vm->pt_root[id]->bo, GEN8_PAGE_SIZE), (unsigned long)xe_bo_main_addr(m->eng->vm->pt_root[id]->bo, GEN8_PAGE_SIZE),
xe_bo_main_addr(m->pt_bo, GEN8_PAGE_SIZE)); (unsigned long)xe_bo_main_addr(m->pt_bo, GEN8_PAGE_SIZE));
/* First part of the test, are we updating our pagetable bo with a new entry? */ /* First part of the test, are we updating our pagetable bo with a new entry? */
xe_map_wr(xe, &bo->vmap, GEN8_PAGE_SIZE * (NUM_KERNEL_PDE - 1), u64, 0xdeaddeadbeefbeef); xe_map_wr(xe, &bo->vmap, GEN8_PAGE_SIZE * (NUM_KERNEL_PDE - 1), u64, 0xdeaddeadbeefbeef);
......
...@@ -1630,7 +1630,7 @@ static void guc_engine_wq_print(struct xe_engine *e, struct drm_printer *p) ...@@ -1630,7 +1630,7 @@ static void guc_engine_wq_print(struct xe_engine *e, struct drm_printer *p)
for (i = parallel_read(xe, map, wq_desc.head); for (i = parallel_read(xe, map, wq_desc.head);
i != parallel_read(xe, map, wq_desc.tail); i != parallel_read(xe, map, wq_desc.tail);
i = (i + sizeof(u32)) % WQ_SIZE) i = (i + sizeof(u32)) % WQ_SIZE)
drm_printf(p, "\tWQ[%ld]: 0x%08x\n", i / sizeof(u32), drm_printf(p, "\tWQ[%zu]: 0x%08x\n", i / sizeof(u32),
parallel_read(xe, map, wq[i / sizeof(u32)])); parallel_read(xe, map, wq[i / sizeof(u32)]));
} }
} }
......
...@@ -234,7 +234,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) ...@@ -234,7 +234,7 @@ int xe_mmio_probe_vram(struct xe_device *xe)
(u64)xe->mem.vram.size >> 20); (u64)xe->mem.vram.size >> 20);
if (xe->mem.vram.size < lmem_size) if (xe->mem.vram.size < lmem_size)
drm_warn(&xe->drm, "Restricting VRAM size to PCI resource size (0x%llx->0x%llx)\n", drm_warn(&xe->drm, "Restricting VRAM size to PCI resource size (0x%llx->0x%llx)\n",
lmem_size, xe->mem.vram.size); lmem_size, (u64)xe->mem.vram.size);
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
xe->mem.vram.mapping = ioremap_wc(xe->mem.vram.io_start, xe->mem.vram.size); xe->mem.vram.mapping = ioremap_wc(xe->mem.vram.io_start, xe->mem.vram.size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment