There's a nice macro to calculate the destination pitch that already takes
into account sub-byte pixel formats. Use that instead of open coding it.
Suggested-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Javier Martinez Canillas <[email protected]>
---
drivers/gpu/drm/tests/drm_format_helper_test.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c
index bfa47f8ffd09..474bb7a1c4ee 100644
--- a/drivers/gpu/drm/tests/drm_format_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
@@ -440,15 +440,12 @@ static size_t conversion_buf_size(u32 dst_format, unsigned int dst_pitch,
const struct drm_rect *clip)
{
const struct drm_format_info *dst_fi = drm_format_info(dst_format);
- unsigned int bpp;
if (!dst_fi)
return -EINVAL;
- if (!dst_pitch) {
- bpp = drm_format_info_bpp(dst_fi, 0);
- dst_pitch = DIV_ROUND_UP(drm_rect_width(clip) * bpp, 8);
- }
+ if (!dst_pitch)
+ dst_pitch = drm_format_info_min_pitch(dst_fi, 0, drm_rect_width(clip));
return dst_pitch * drm_rect_height(clip);
}
base-commit: 165d5133731a2e045abdd6d9d3c9221fdc2a556e
--
2.39.2
Am 16.03.23 um 23:34 schrieb Javier Martinez Canillas:
> There's a nice macro to calculate the destination pitch that already takes
> into account sub-byte pixel formats. Use that instead of open coding it.
>
> Suggested-by: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Javier Martinez Canillas <[email protected]>
Reviewed-by: Thomas Zimmermann <[email protected]>
> ---
>
> drivers/gpu/drm/tests/drm_format_helper_test.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c
> index bfa47f8ffd09..474bb7a1c4ee 100644
> --- a/drivers/gpu/drm/tests/drm_format_helper_test.c
> +++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
> @@ -440,15 +440,12 @@ static size_t conversion_buf_size(u32 dst_format, unsigned int dst_pitch,
> const struct drm_rect *clip)
> {
> const struct drm_format_info *dst_fi = drm_format_info(dst_format);
> - unsigned int bpp;
>
> if (!dst_fi)
> return -EINVAL;
>
> - if (!dst_pitch) {
> - bpp = drm_format_info_bpp(dst_fi, 0);
> - dst_pitch = DIV_ROUND_UP(drm_rect_width(clip) * bpp, 8);
> - }
> + if (!dst_pitch)
> + dst_pitch = drm_format_info_min_pitch(dst_fi, 0, drm_rect_width(clip));
>
> return dst_pitch * drm_rect_height(clip);
> }
>
> base-commit: 165d5133731a2e045abdd6d9d3c9221fdc2a556e
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
Thomas Zimmermann <[email protected]> writes:
> Am 16.03.23 um 23:34 schrieb Javier Martinez Canillas:
>> There's a nice macro to calculate the destination pitch that already takes
>> into account sub-byte pixel formats. Use that instead of open coding it.
>>
>> Suggested-by: Geert Uytterhoeven <[email protected]>
>> Signed-off-by: Javier Martinez Canillas <[email protected]>
>
> Reviewed-by: Thomas Zimmermann <[email protected]>
>
Pushed to drm-misc (drm-misc-next). Thanks!
--
Best regards,
Javier Martinez Canillas
Core Platforms
Red Hat