From 890ff49038ed128e207a7a8a31077cd2eeda82b9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 1 Jan 2026 16:23:24 +0100 Subject: [PATCH] rocket: Fix printing of rknpu_mem_create.dma_addr The Linux kernel's __u64 isn't always implemented as a long long, and there's no nice define for printing it like with uint64_t. (cherry picked from commit 41b9dc3a2cdf1e3163d517bd7cfc8c8738e8db92) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/rocket/intercept.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5811011f692..bee808c8ef7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1134,7 +1134,7 @@ "description": "rocket: Fix printing of rknpu_mem_create.dma_addr", "nominated": false, "nomination_type": 0, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/rocket/intercept.c b/src/gallium/drivers/rocket/intercept.c index 6edf3f0aa81..0e9c957655e 100644 --- a/src/gallium/drivers/rocket/intercept.c +++ b/src/gallium/drivers/rocket/intercept.c @@ -261,7 +261,7 @@ handle_mem_create(struct rknpu_mem_create *args) context.bos[context.next_handle_id].obj_addr = args->obj_addr; context.bos[context.next_handle_id].dma_addr = args->dma_addr; - fprintf(stderr, "%s: dma_addr %llx\n", __func__, args->dma_addr); + fprintf(stderr, "%s: dma_addr %llx\n", __func__, (long long)args->dma_addr); context.next_handle_id++; return ret;