From: Lucas De Marchi Date: Thu, 22 Dec 2022 20:14:27 +0000 (-0800) Subject: drm/xe: Fix some log messages on 32b X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=857912c37ea786715e03b5bf25db07e28fc2ba73;p=linux.git 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: Lucas De Marchi Reviewed-by: Rodrigo Vivi Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c index 0f3b819f0a349..03a60d5b42f1d 100644 --- a/drivers/gpu/drm/xe/tests/xe_migrate.c +++ b/drivers/gpu/drm/xe/tests/xe_migrate.c @@ -263,9 +263,9 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test) goto free_tiny; } - kunit_info(test, "Starting tests, top level PT addr: %llx, special pagetable base addr: %llx\n", - xe_bo_main_addr(m->eng->vm->pt_root[id]->bo, GEN8_PAGE_SIZE), - xe_bo_main_addr(m->pt_bo, GEN8_PAGE_SIZE)); + kunit_info(test, "Starting tests, top level PT addr: %lx, special pagetable base addr: %lx\n", + (unsigned long)xe_bo_main_addr(m->eng->vm->pt_root[id]->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? */ xe_map_wr(xe, &bo->vmap, GEN8_PAGE_SIZE * (NUM_KERNEL_PDE - 1), u64, 0xdeaddeadbeefbeef); diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index e0d424c2b78c0..2d4eb527d6e8b 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -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); i != parallel_read(xe, map, wq_desc.tail); 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)])); } } diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index 54d2a94a75190..7c87be130e026 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -234,7 +234,7 @@ int xe_mmio_probe_vram(struct xe_device *xe) (u64)xe->mem.vram.size >> 20); if (xe->mem.vram.size < lmem_size) 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 xe->mem.vram.mapping = ioremap_wc(xe->mem.vram.io_start, xe->mem.vram.size);