drm/vkms: Fix cpu_to_le16()/le16_to_cpu() warnings
PATCH 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
Add casts to fix both warnings.
--- drivers/gpu/drm/vkms/vkms_formats.c | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/vkms/vkms_formats.c +16 -16
@@ -77,10 +77,10 @@ static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_ {u16 *pixels = (u16 *)src_pixels; - out_pixel->a =le16_to_cpu (pixels[3 ]); - out_pixel->r =le16_to_cpu (pixels[2 ]); - out_pixel->g =le16_to_cpu (pixels[1 ]); - out_pixel->b =le16_to_cpu (pixels[0 ]); + out_pixel->a =le16_to_cpu ((__force __le16 )pixels[3 ]); + out_pixel->r =le16_to_cpu ((__force __le16 )pixels[2 ]); + out_pixel->g =le16_to_cpu ((__force __le16 )pixels[1 ]); + out_pixel->b =le16_to_cpu ((__force __le16 )pixels[0 ]); }static void XRGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel)
@@ -88,9 +88,9 @@ static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_u16 *pixels = (u16 *)src_pixels; out_pixel->a = (u16 )0xffff ; - out_pixel->r =le16_to_cpu (pixels[2 ]); - out_pixel->g =le16_to_cpu (pixels[1 ]); - out_pixel->b =le16_to_cpu (pixels[0 ]); + out_pixel->r =le16_to_cpu ((__force __le16 )pixels[2 ]); + out_pixel->g =le16_to_cpu ((__force __le16 )pixels[1 ]); + out_pixel->b =le16_to_cpu ((__force __le16 )pixels[0 ]); }static void RGB565_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel)
@@ -100,7 +100,7 @@ static void RGB565_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixel)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 )); -u16 rgb_565 =le16_to_cpu (*pixels); +u16 rgb_565 =le16_to_cpu ((__force __le16)*pixels);s64 fp_r =drm_int2fixp ((rgb_565 >>11 ) &0x1f );s64 fp_g =drm_int2fixp ((rgb_565 >>5 ) &0x3f );s64 fp_b =drm_int2fixp (rgb_565 &0x1f );
@@ -180,10 +180,10 @@ static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_p {u16 *pixels = (u16 *)dst_pixels; - pixels[3 ] =cpu_to_le16 (in_pixel->a); - pixels[2 ] =cpu_to_le16 (in_pixel->r); - pixels[1 ] =cpu_to_le16 (in_pixel->g); - pixels[0 ] =cpu_to_le16 (in_pixel->b); + pixels[3 ] = (__force u16 )cpu_to_le16 (in_pixel->a); + pixels[2 ] = (__force u16 )cpu_to_le16 (in_pixel->r); + pixels[1 ] = (__force u16 )cpu_to_le16 (in_pixel->g); + pixels[0 ] = (__force u16 )cpu_to_le16 (in_pixel->b); }static void argb_u16_to_XRGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel)
@@ -191,9 +191,9 @@ static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pu16 *pixels = (u16 *)dst_pixels; pixels[3 ] =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); + pixels[2 ] = (__force u16 )cpu_to_le16 (in_pixel->r); + pixels[1 ] = (__force u16 )cpu_to_le16 (in_pixel->g); + pixels[0 ] = (__force u16 )cpu_to_le16 (in_pixel->b); }static void argb_u16_to_RGB565 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel)
@@ -211,7 +211,7 @@ static void argb_u16_to_RGB565(u8 *dst_pixels, struct pixel_argb_u16 *in_pixel)u16 g =drm_fixp2int (drm_fixp_div (fp_g, fp_g_ratio));u16 b =drm_fixp2int (drm_fixp_div (fp_b, fp_rb_ratio)); - *pixels =cpu_to_le16 (r <<11 | g <<5 | b); + *pixels = (__force u16 )cpu_to_le16 (r <<11 | g <<5 | b); } void vkms_writeback_row(struct vkms_writeback_job *wb,
Signature · 1 line
2.45.2
Thomas Zimmermann
maintainerHi
Am 12.07.24 um 18:16 schrieb José Expósito:
Quoted 23 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
__le16Add casts to fix both warnings.
Signed-off-by José Expósito <[email protected]>--- drivers/gpu/drm/vkms/vkms_formats.c | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-)drivers/gpu/drm/vkms/vkms_formats.c +0
-0
drivers/gpu/drm/vkms/vkms_formats.c static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_ · line 78
Quoted 2 lines
drivers/gpu/drm/vkms/vkms_formats.c +0
-0@@ -77,10 +77,10 @@ static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_ {u16 *pixels = (u16 *)src_pixels;
You should rather declare pixels as __le16 pointer. Same for the other changes. See [1] for an example.
Best regards
Thomas
[1] https://elixir.bootlin.com/linux/v6.9/source/drivers/gpu/drm/drm_format_helper.c#L420
Quoted 71 lines
drivers/gpu/drm/vkms/vkms_formats.c +16
-16- out_pixel->a =le16_to_cpu (pixels[3 ]); - out_pixel->r =le16_to_cpu (pixels[2 ]); - out_pixel->g =le16_to_cpu (pixels[1 ]); - out_pixel->b =le16_to_cpu (pixels[0 ]); + out_pixel->a =le16_to_cpu ((__force __le16 )pixels[3 ]); + out_pixel->r =le16_to_cpu ((__force __le16 )pixels[2 ]); + out_pixel->g =le16_to_cpu ((__force __le16 )pixels[1 ]); + out_pixel->b =le16_to_cpu ((__force __le16 )pixels[0 ]); }static void XRGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel)@@ -88,9 +88,9 @@ static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_u16 *pixels = (u16 *)src_pixels; out_pixel->a = (u16 )0xffff ; - out_pixel->r =le16_to_cpu (pixels[2 ]); - out_pixel->g =le16_to_cpu (pixels[1 ]); - out_pixel->b =le16_to_cpu (pixels[0 ]); + out_pixel->r =le16_to_cpu ((__force __le16 )pixels[2 ]); + out_pixel->g =le16_to_cpu ((__force __le16 )pixels[1 ]); + out_pixel->b =le16_to_cpu ((__force __le16 )pixels[0 ]); }static void RGB565_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel)@@ -100,7 +100,7 @@ static void RGB565_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixel)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 )); -u16 rgb_565 =le16_to_cpu (*pixels); +u16 rgb_565 =le16_to_cpu ((__force __le16)*pixels);s64 fp_r =drm_int2fixp ((rgb_565 >>11 ) &0x1f );s64 fp_g =drm_int2fixp ((rgb_565 >>5 ) &0x3f );s64 fp_b =drm_int2fixp (rgb_565 &0x1f );@@ -180,10 +180,10 @@ static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_p {u16 *pixels = (u16 *)dst_pixels; - pixels[3 ] =cpu_to_le16 (in_pixel->a); - pixels[2 ] =cpu_to_le16 (in_pixel->r); - pixels[1 ] =cpu_to_le16 (in_pixel->g); - pixels[0 ] =cpu_to_le16 (in_pixel->b); + pixels[3 ] = (__force u16 )cpu_to_le16 (in_pixel->a); + pixels[2 ] = (__force u16 )cpu_to_le16 (in_pixel->r); + pixels[1 ] = (__force u16 )cpu_to_le16 (in_pixel->g); + pixels[0 ] = (__force u16 )cpu_to_le16 (in_pixel->b); }static void argb_u16_to_XRGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel)@@ -191,9 +191,9 @@ static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pu16 *pixels = (u16 *)dst_pixels; pixels[3 ] =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); + pixels[2 ] = (__force u16 )cpu_to_le16 (in_pixel->r); + pixels[1 ] = (__force u16 )cpu_to_le16 (in_pixel->g); + pixels[0 ] = (__force u16 )cpu_to_le16 (in_pixel->b); }static void argb_u16_to_RGB565 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel)@@ -211,7 +211,7 @@ static void argb_u16_to_RGB565(u8 *dst_pixels, struct pixel_argb_u16 *in_pixel)u16 g =drm_fixp2int (drm_fixp_div (fp_g, fp_g_ratio));u16 b =drm_fixp2int (drm_fixp_div (fp_b, fp_rb_ratio)); - *pixels =cpu_to_le16 (r <<11 | g <<5 | b); + *pixels = (__force u16 )cpu_to_le16 (r <<11 | g <<5 | b); } void vkms_writeback_row(struct vkms_writeback_job *wb,
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 21 lines · Thomas Zimmermann
Hi
Am 12.07.24 um 18:16 schrieb José Expósito:
Quoted 18 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
__le16Add casts to fix both warnings.
Signed-off-by José Expósito <[email protected]>--- drivers/gpu/drm/vkms/vkms_formats.c | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-)
Quoted 10 lines
drivers/gpu/drm/vkms/vkms_formats.c static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_ · line 78
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_formats.c +0
-0@@ -77,10 +77,10 @@ static void ARGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_ {u16 *pixels = (u16 *)src_pixels;You should rather declare pixels as
__le16pointer. Same for the other changes. See [1] for an example.
Thanks a lot for the quick review Thomas.
v2 is available here:
https://lore.kernel.org/dri-devel/[email protected]/T/#u
Quoted 75 lines
Best regards
Thomas[1] https://elixir.bootlin.com/linux/v6.9/source/drivers/gpu/drm/drm_format_helper.c#L420
Quoted 60 lines
drivers/gpu/drm/vkms/vkms_formats.c +16
-16- out_pixel->a =le16_to_cpu (pixels[3 ]); - out_pixel->r =le16_to_cpu (pixels[2 ]); - out_pixel->g =le16_to_cpu (pixels[1 ]); - out_pixel->b =le16_to_cpu (pixels[0 ]); + out_pixel->a =le16_to_cpu ((__force __le16 )pixels[3 ]); + out_pixel->r =le16_to_cpu ((__force __le16 )pixels[2 ]); + out_pixel->g =le16_to_cpu ((__force __le16 )pixels[1 ]); + out_pixel->b =le16_to_cpu ((__force __le16 )pixels[0 ]); }static void XRGB16161616_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel)@@ -88,9 +88,9 @@ static void XRGB16161616_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_u16 *pixels = (u16 *)src_pixels; out_pixel->a = (u16 )0xffff ; - out_pixel->r =le16_to_cpu (pixels[2 ]); - out_pixel->g =le16_to_cpu (pixels[1 ]); - out_pixel->b =le16_to_cpu (pixels[0 ]); + out_pixel->r =le16_to_cpu ((__force __le16 )pixels[2 ]); + out_pixel->g =le16_to_cpu ((__force __le16 )pixels[1 ]); + out_pixel->b =le16_to_cpu ((__force __le16 )pixels[0 ]); }static void RGB565_to_argb_u16 (u8 *src_pixels,struct pixel_argb_u16 *out_pixel)@@ -100,7 +100,7 @@ static void RGB565_to_argb_u16(u8 *src_pixels, struct pixel_argb_u16 *out_pixel)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 )); -u16 rgb_565 =le16_to_cpu (*pixels); +u16 rgb_565 =le16_to_cpu ((__force __le16)*pixels);s64 fp_r =drm_int2fixp ((rgb_565 >>11 ) &0x1f );s64 fp_g =drm_int2fixp ((rgb_565 >>5 ) &0x3f );s64 fp_b =drm_int2fixp (rgb_565 &0x1f );@@ -180,10 +180,10 @@ static void argb_u16_to_ARGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_p {u16 *pixels = (u16 *)dst_pixels; - pixels[3 ] =cpu_to_le16 (in_pixel->a); - pixels[2 ] =cpu_to_le16 (in_pixel->r); - pixels[1 ] =cpu_to_le16 (in_pixel->g); - pixels[0 ] =cpu_to_le16 (in_pixel->b); + pixels[3 ] = (__force u16 )cpu_to_le16 (in_pixel->a); + pixels[2 ] = (__force u16 )cpu_to_le16 (in_pixel->r); + pixels[1 ] = (__force u16 )cpu_to_le16 (in_pixel->g); + pixels[0 ] = (__force u16 )cpu_to_le16 (in_pixel->b); }static void argb_u16_to_XRGB16161616 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel)@@ -191,9 +191,9 @@ static void argb_u16_to_XRGB16161616(u8 *dst_pixels, struct pixel_argb_u16 *in_pu16 *pixels = (u16 *)dst_pixels; pixels[3 ] =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); + pixels[2 ] = (__force u16 )cpu_to_le16 (in_pixel->r); + pixels[1 ] = (__force u16 )cpu_to_le16 (in_pixel->g); + pixels[0 ] = (__force u16 )cpu_to_le16 (in_pixel->b); }static void argb_u16_to_RGB565 (u8 *dst_pixels,struct pixel_argb_u16 *in_pixel)@@ -211,7 +211,7 @@ static void argb_u16_to_RGB565(u8 *dst_pixels, struct pixel_argb_u16 *in_pixel)u16 g =drm_fixp2int (drm_fixp_div (fp_g, fp_g_ratio));u16 b =drm_fixp2int (drm_fixp_div (fp_b, fp_rb_ratio)); - *pixels =cpu_to_le16 (r <<11 | g <<5 | b); + *pixels = (__force u16 )cpu_to_le16 (r <<11 | g <<5 | b); } void vkms_writeback_row(struct vkms_writeback_job *wb,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)