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 <lucas.demarchi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c
index 0f3b819f0a34926e82bd9d4413cdc77b34fb7675..03a60d5b42f1de0e4bfea6cd3862ec00df109875 100644 (file)
--- 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 e0d424c2b78c0770388ed0ed97d230018b571811..2d4eb527d6e8bf9af03f2247ddf98edc78980152 100644 (file)
--- 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 54d2a94a751908631c0e64c421ad4e99b14aba94..7c87be130e0262911d32965492311342a9a77cf3 100644 (file)
--- 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);