2023-06-01 21:53:33

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] drm/i915/pxp: use correct format string for size_t

From: Arnd Bergmann <[email protected]>

While 'unsigned long' needs the %ld format string, size_t needs the %z
modifier:

drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c: In function 'gsccs_send_message':
include/drm/drm_print.h:456:39: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
456 | dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)

Fixes: dc9ac125d81fa ("drm/i915/pxp: Add GSC-CS backend to send GSC fw messages")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
index 8dc41de3f6f74..290ed5ac487de 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
@@ -143,7 +143,7 @@ gsccs_send_message(struct intel_pxp *pxp,

reply_size = header->message_size - sizeof(*header);
if (reply_size > msg_out_size_max) {
- drm_warn(&i915->drm, "caller with insufficient PXP reply size %u (%ld)\n",
+ drm_warn(&i915->drm, "caller with insufficient PXP reply size %u (%zd)\n",
reply_size, msg_out_size_max);
reply_size = msg_out_size_max;
}
--
2.39.2



Subject: Re: [Intel-gfx] [PATCH] drm/i915/pxp: use correct format string for size_t

On Thu, 2023-06-01 at 23:36 +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> While 'unsigned long' needs the %ld format string, size_t needs the %z
> modifier:

alan:snip


> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> @@ -143,7 +143,7 @@ gsccs_send_message(struct intel_pxp *pxp,
>
> reply_size = header->message_size - sizeof(*header);
> if (reply_size > msg_out_size_max) {
> - drm_warn(&i915->drm, "caller with insufficient PXP reply size %u (%ld)\n",
> + drm_warn(&i915->drm, "caller with insufficient PXP reply size %u (%zd)\n",
> reply_size, msg_out_size_max);
> reply_size = msg_out_size_max;
> }
Thanks Arnd for catching this, although i believe Nathan sumbmitted a patch for the same fix yesterday and received an RB from Andi.

2023-06-02 01:04:54

by Andi Shyti

[permalink] [raw]
Subject: Re: [Intel-gfx] [PATCH] drm/i915/pxp: use correct format string for size_t

Hi Arnd,

On Thu, Jun 01, 2023 at 10:00:27PM +0000, Teres Alexis, Alan Previn wrote:
> On Thu, 2023-06-01 at 23:36 +0200, Arnd Bergmann wrote:
> > From: Arnd Bergmann <[email protected]>
> >
> > While 'unsigned long' needs the %ld format string, size_t needs the %z
> > modifier:
>
> alan:snip
>
>
> > +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c
> > @@ -143,7 +143,7 @@ gsccs_send_message(struct intel_pxp *pxp,
> >
> > reply_size = header->message_size - sizeof(*header);
> > if (reply_size > msg_out_size_max) {
> > - drm_warn(&i915->drm, "caller with insufficient PXP reply size %u (%ld)\n",
> > + drm_warn(&i915->drm, "caller with insufficient PXP reply size %u (%zd)\n",
> > reply_size, msg_out_size_max);
> > reply_size = msg_out_size_max;
> > }
> Thanks Arnd for catching this, although i believe Nathan sumbmitted a patch for the same fix yesterday and received an RB from Andi.

yes, the patch is here:

https://patchwork.freedesktop.org/patch/540272/?series=118593&rev=1

I'm waiting for full CI results to merge this.

Thanks,
Andi