git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-21 04:53:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/format-helper: fix build

Browse Source 
Build fails with:

error: multiple unsequenced modifications to 'sbuf32'
[-Werror,-Wunsequenced]
  264 |                         le32_to_cpup(sbuf32++),
      |                                            ^
  265 |                         le32_to_cpup(sbuf32++),
      |                                            ~~

With that move the increment of the sbuf32 pointer to the end of the
loop, instead of inside the array list initializer, where the
order/sequence of the sbuf32 pointer modifications is not defined.

Fixes: 58523a25cb ("drm/format-helper: Optimize 32-to-24-bpp conversion")
Fixes: 3f31a017dd ("drm/format-helper: Optimize 32-to-16-bpp conversion")
Fixes: 65931bbc51 ("drm/format-helper: Optimize 32-to-8-bpp conversion")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250402104430.142398-2-matthew.auld@intel.com
This commit is contained in:
Matthew Auld
2025-04-02 11:44:31 +01:00
committed by Thomas Zimmermann
parent bc3faba1f9
commit 5024aa7a76
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/drm_format_helper.c
View File

@@ -261,10 +261,10 @@ static __always_inline void drm_fb_xfrm_line_32to8(void *dbuf, const void *sbuf,
/* write 4 pixels at once */
while (sbuf32 < ALIGN_DOWN_PIXELS(send32, pixels, 4)) {
u32 pix[4] = {
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32),
le32_to_cpup(sbuf32 + 1),
le32_to_cpup(sbuf32 + 2),
le32_to_cpup(sbuf32 + 3),
};
/* write output bytes in reverse order for little endianness */
u32 val32 = xfrm_pixel(pix[0]) |
@@ -272,6 +272,7 @@ static __always_inline void drm_fb_xfrm_line_32to8(void *dbuf, const void *sbuf,
(xfrm_pixel(pix[2]) << 16) |
(xfrm_pixel(pix[3]) << 24);
*dbuf32++ = cpu_to_le32(val32);
sbuf32 += ARRAY_SIZE(pix);
}
/* write trailing pixels */
@@ -294,10 +295,10 @@ static __always_inline void drm_fb_xfrm_line_32to16(void *dbuf, const void *sbuf
/* write 4 pixels at once */
while (sbuf32 < ALIGN_DOWN_PIXELS(send32, pixels, 4)) {
u32 pix[4] = {
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32),
le32_to_cpup(sbuf32 + 1),
le32_to_cpup(sbuf32 + 2),
le32_to_cpup(sbuf32 + 3),
};
/* write output bytes in reverse order for little endianness */
u64 val64 = ((u64)xfrm_pixel(pix[0])) |
@@ -305,6 +306,7 @@ static __always_inline void drm_fb_xfrm_line_32to16(void *dbuf, const void *sbuf
((u64)xfrm_pixel(pix[2]) << 32) |
((u64)xfrm_pixel(pix[3]) << 48);
*dbuf64++ = cpu_to_le64(val64);
sbuf32 += ARRAY_SIZE(pix);
}
#endif
@@ -312,13 +314,14 @@ static __always_inline void drm_fb_xfrm_line_32to16(void *dbuf, const void *sbuf
dbuf32 = (__le32 __force *)dbuf64;
while (sbuf32 < ALIGN_DOWN_PIXELS(send32, pixels, 2)) {
u32 pix[2] = {
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32++),
le32_to_cpup(sbuf32),
le32_to_cpup(sbuf32 + 1),
};
/* write output bytes in reverse order for little endianness */
u32 val32 = xfrm_pixel(pix[0]) |
(xfrm_pixel(pix[1]) << 16);
*dbuf32++ = cpu_to_le32(val32);
sbuf32 += ARRAY_SIZE(pix);
}
/* write trailing pixel */
@@ -339,10 +342,10 @@ static __always_inline void drm_fb_xfrm_line_32to24(void *dbuf, const void *sbuf
/* write pixels in chunks of 4 */
while (sbuf32 < ALIGN_DOWN_PIXELS(send32, pixels, 4)) {
u32 val24[4] = {
xfrm_pixel(le32_to_cpup(sbuf32++)),
xfrm_pixel(le32_to_cpup(sbuf32++)),
xfrm_pixel(le32_to_cpup(sbuf32++)),
xfrm_pixel(le32_to_cpup(sbuf32++)),
xfrm_pixel(le32_to_cpup(sbuf32)),
xfrm_pixel(le32_to_cpup(sbuf32 + 1)),
xfrm_pixel(le32_to_cpup(sbuf32 + 2)),
xfrm_pixel(le32_to_cpup(sbuf32 + 3)),
};
u32 out32[3] = {
/* write output bytes in reverse order for little endianness */
@@ -363,6 +366,7 @@ static __always_inline void drm_fb_xfrm_line_32to24(void *dbuf, const void *sbuf
*dbuf32++ = cpu_to_le32(out32[0]);
*dbuf32++ = cpu_to_le32(out32[1]);
*dbuf32++ = cpu_to_le32(out32[2]);
sbuf32 += ARRAY_SIZE(val24);
}
/* write trailing pixel */