drm/vkms: Fix cpu_to_le16()/le16_to_cpu() warnings
PATCH v2 1/1 drm/vkms: Fix cpu_to_le16()/le16_to_cpu() warnings
Building with Sparse enabled prints this warning for cpu_to_le16() calls:
warning: incorrect type in assignment (different base types)
expected unsigned short [usertype]
got restricted __le16 [usertype]
And this warning for le16_to_cpu() calls:
warning: cast to restricted __le16
Declare the target buffer as __le16 to fix both warnings.
---
v1 -> v2: https://lore.kernel.org/dri-devel/[email protected]/T/
- Thomas Zimmermann: Declare "pixels" cariable as __le16 instead of multiple casting.
--- drivers/gpu/drm/vkms/vkms_formats.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/vkms/vkms_formats.c +7 -7
@@ -75,7 +75,7 @@ static void XRGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixestatic void ARGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels; out_pixel->a =le16_to_cpu (pixels[3 ]); out_pixel->r =le16_to_cpu (pixels[2 ]);
@@ -85,7 +85,7 @@ static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_static void XRGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels; out_pixel->a = (u16 )0xffff ; out_pixel->r =le16_to_cpu (pixels[2 ]);
@@ -95,7 +95,7 @@ static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_static void RGB565_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels;s64 fp_rb_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (31 ));s64 fp_g_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (63 ));
@@ -178,7 +178,7 @@ static void argb_u16_to_XRGB8888(u8 *dst_pixels, struct pixel_argb_u16 *in_pixelstatic void argb_u16_to_ARGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels; pixels[3 ] =cpu_to_le16 (in_pixel->a); pixels[2 ] =cpu_to_le16 (in_pixel->r);
@@ -188,9 +188,9 @@ static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pstatic void argb_u16_to_XRGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels; - pixels[3 ] =0xffff ; + pixels[3 ] = (__force __le16 )0xffff ; pixels[2 ] =cpu_to_le16 (in_pixel->r); pixels[1 ] =cpu_to_le16 (in_pixel->g); pixels[0 ] =cpu_to_le16 (in_pixel->b);
@@ -198,7 +198,7 @@ static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pstatic void argb_u16_to_RGB565 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels;s64 fp_rb_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (31 ));s64 fp_g_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (63 ));
Signature · 1 line
2.45.2
Hi
Am 15.07.24 um 17:16 schrieb José Expósito:
Quoted 66 lines
Building with Sparse enabled prints this warning for
cpu_to_le16()calls:warning: incorrect type in assignment (different base types)
expected unsigned short [usertype]
got restricted__le16[usertype]And this warning for
le16_to_cpu()calls:warning: cast to restricted
__le16Declare the target buffer as
__le16to fix both warnings.Signed-off-by José Expósito <[email protected]>---
v1 -> v2: https://lore.kernel.org/dri-devel/[email protected]/T/
- Thomas Zimmermann: Declare "pixels" cariable as
__le16instead of multiple casting.--- drivers/gpu/drm/vkms/vkms_formats.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/vkms/vkms_formats.c +4
-4@@ -75,7 +75,7 @@ static void XRGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixestatic void ARGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels; out_pixel->a =le16_to_cpu (pixels[3 ]); out_pixel->r =le16_to_cpu (pixels[2 ]);@@ -85,7 +85,7 @@ static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_static void XRGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels; out_pixel->a = (u16 )0xffff ; out_pixel->r =le16_to_cpu (pixels[2 ]);@@ -95,7 +95,7 @@ static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_static void RGB565_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels;s64 fp_rb_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (31 ));s64 fp_g_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (63 ));@@ -178,7 +178,7 @@ static void argb_u16_to_XRGB8888(u8 *dst_pixels, struct pixel_argb_u16 *in_pixelstatic void argb_u16_to_ARGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels; pixels[3 ] =cpu_to_le16 (in_pixel->a); pixels[2 ] =cpu_to_le16 (in_pixel->r);
drivers/gpu/drm/vkms/vkms_formats.c static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_p · line 193
Quoted 8 lines
drivers/gpu/drm/vkms/vkms_formats.c +2
-2@@ -188,9 +188,9 @@ static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pstatic void argb_u16_to_XRGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels; - pixels[3 ] =0xffff ; + pixels[3 ] = (__force __le16 )0xffff ;
I'd use cpu_to_le16() even on the constant. It makes it clear what is happening, makes __le16 opaque, and avoids the ugly cast.
In any case
Best regards
Thomas
Quoted 12 lines
drivers/gpu/drm/vkms/vkms_formats.c +1
-1pixels[2 ] =cpu_to_le16 (in_pixel->r); pixels[1 ] =cpu_to_le16 (in_pixel->g); pixels[0 ] =cpu_to_le16 (in_pixel->b);@@ -198,7 +198,7 @@ static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pstatic void argb_u16_to_RGB565 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels;s64 fp_rb_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (31 ));s64 fp_g_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (63 ));
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Quoted 30 lines · José Expósito
Building with Sparse enabled prints this warning for
cpu_to_le16()calls:warning: incorrect type in assignment (different base types)
expected unsigned short [usertype]
got restricted__le16[usertype]And this warning for
le16_to_cpu()calls:warning: cast to restricted
__le16Declare the target buffer as
__le16to fix both warnings.Signed-off-by José Expósito <[email protected]>---
v1 -> v2: https://lore.kernel.org/dri-devel/[email protected]/T/
- Thomas Zimmermann: Declare "pixels" cariable as
__le16instead of multiple casting.--- drivers/gpu/drm/vkms/vkms_formats.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/gpu/drm/vkms/vkms_formats.c +0
-0
drivers/gpu/drm/vkms/vkms_formats.c static void XRGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixe · line 78
Quoted 5 lines
drivers/gpu/drm/vkms/vkms_formats.c +1
-1@@ -75,7 +75,7 @@ static void XRGB8888_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixestatic void ARGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels;
Hi,
I think you don't need __force for this cast, so you can remove it.
Quoted 29 lines
drivers/gpu/drm/vkms/vkms_formats.c +3
-3out_pixel->a =le16_to_cpu (pixels[3 ]); out_pixel->r =le16_to_cpu (pixels[2 ]);@@ -85,7 +85,7 @@ static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_static void XRGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels; out_pixel->a = (u16 )0xffff ; out_pixel->r =le16_to_cpu (pixels[2 ]);@@ -95,7 +95,7 @@ static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_static void RGB565_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel) { -u16 *pixels = (u16 *)src_pixels; +__le16 *pixels = (__force __le16 *)src_pixels;s64 fp_rb_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (31 ));s64 fp_g_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (63 ));@@ -178,7 +178,7 @@ static void argb_u16_to_XRGB8888(u8 *dst_pixels, struct pixel_argb_u16 *in_pixelstatic void argb_u16_to_ARGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels; pixels[3 ] =cpu_to_le16 (in_pixel->a); pixels[2 ] =cpu_to_le16 (in_pixel->r);
drivers/gpu/drm/vkms/vkms_formats.c static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_p · line 193
Quoted 8 lines
drivers/gpu/drm/vkms/vkms_formats.c +2
-2@@ -188,9 +188,9 @@ static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pstatic void argb_u16_to_XRGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels; - pixels[3 ] =0xffff ; + pixels[3 ] = (__force __le16 )0xffff ;
I agree with Thomas Zimmerman, I prefer cpu_to_le16().
With or without those modifications:
Thanks,
Louis Chauvet
Quoted 15 lines
drivers/gpu/drm/vkms/vkms_formats.c +1
-1pixels[2 ] =cpu_to_le16 (in_pixel->r); pixels[1 ] =cpu_to_le16 (in_pixel->g); pixels[0 ] =cpu_to_le16 (in_pixel->b);@@ -198,7 +198,7 @@ static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pstatic void argb_u16_to_RGB565 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel) { -u16 *pixels = (u16 *)dst_pixels; +__le16 *pixels = (__force __le16 *)dst_pixels;s64 fp_rb_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (31 ));s64 fp_g_ratio =drm_fixp_div (drm_int2fixp (65535 ),drm_int2fixp (63 ));Signature · 1 line
2.45.2
Signature · 3 lines
Louis Chauvet, Bootlin Embedded Linux and Kernel engineering https://bootlin.com