patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers: display: sdl: Fix asserts in sdl_display_write

Browse source 
The asserts and validation code were incorrectly mixing pitch and
width.  These incorrect checks were preventing rendering code from
re-using a smaller section of a buffer allocated to fit the full
screen. We expect to be able to update a portion of the display from a
portion of the buffer, in which case pitch must remain the screen
width. Expecting x + pitch to be smaller than the screen width is
incorrect.

Signed-off-by: Nathan Collins <nathan.collins@kdab.com>
This commit is contained in:
Nathan Collins 2024-04-26 13:48:56 +00:00 committed by Carles Cufí
parent ad210f7579
commit acc2b51959
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/display/display_sdl.c
View file

@ -235,13 +235,13 @@ static int sdl_display_write(const struct device *dev, const uint16_t x,
"Pitch in descriptor is larger than screen size"); "Pitch in descriptor is larger than screen size");
__ASSERT(desc->height <= config->height, __ASSERT(desc->height <= config->height,
"Height in descriptor is larger than screen size"); "Height in descriptor is larger than screen size");
__ASSERT(x + desc->pitch <= config->width, __ASSERT(x + desc->width <= config->width,
"Writing outside screen boundaries in horizontal direction"); "Writing outside screen boundaries in horizontal direction");
__ASSERT(y + desc->height <= config->height, __ASSERT(y + desc->height <= config->height,
"Writing outside screen boundaries in vertical direction"); "Writing outside screen boundaries in vertical direction");
if (desc->width > desc->pitch || if (desc->width > desc->pitch ||
x + desc->pitch > config->width || x + desc->width > config->width ||
y + desc->height > config->height) { y + desc->height > config->height) {
return -EINVAL; return -EINVAL;
} }