CHROMIUM: MALI: Fix printf code for 'seqno'
As of CL:1704173, seqno is 64-bit. We need to adjust our printf
strings to account for this. Otherwise, we get warnings like:
.../mali_kbase_jd_debugfs.c:
In function 'kbase_jd_debugfs_fence_info':
.../mali_kbase_jd_debugfs.c:86:7:
error: format '%u' expects argument of type 'unsigned int',
but argument 4 has type 'u64' [-Werror=format=]
Technically seqno moved to 64-bit in kernel 5.1, but we've backported
it to our 4.19 kernel so we can't exactly add a special-version check.
BUG=chromium:941638
TEST=Build and boot
Change-Id: I63846e1f7b1ef9e1269c3e9824dbbc15cdb5ae12
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/1709132
Reviewed-by: Guenter Roeck <groeck@chromium.org>
diff --git a/drivers/gpu/arm/midgard/mali_kbase_fence.c b/drivers/gpu/arm/midgard/mali_kbase_fence.c
index ac8272c..c75be1a 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_fence.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_fence.c
@@ -67,7 +67,7 @@
kbase_fence_fence_value_str(struct dma_fence *fence, char *str, int size)
#endif
{
- snprintf(str, size, "%u", fence->seqno);
+ snprintf(str, size, "%llu", fence->seqno);
}
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0))
diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c
index 271daef..6b79d89 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c
@@ -78,7 +78,7 @@
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
"Sd(%u#%u: %s) ",
#else
- "Sd(%llu#%u: %s) ",
+ "Sd(%llu#%llu: %s) ",
#endif
fence->context,
fence->seqno,
@@ -98,7 +98,7 @@
#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0))
"Wd(%u#%u: %s) ",
#else
- "Wd(%llu#%u: %s) ",
+ "Wd(%llu#%llu: %s) ",
#endif
fence->context,
fence->seqno,
diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
index bb94aee..cda1f1b 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_sync_file.c
@@ -307,7 +307,7 @@
scnprintf(info->name, sizeof(info->name), "%u#%u",
fence->context, fence->seqno);
#else
- scnprintf(info->name, sizeof(info->name), "%llu#%u",
+ scnprintf(info->name, sizeof(info->name), "%llu#%llu",
fence->context, fence->seqno);
#endif
}
