2022-06-30 19:20:33

by Maira Canal

Subject: [PATCH] drm/amd/display: Remove return value of Calculate256BBlockSizes

The function Calculate256BBlockSizes always returns true, regardless of
the parameters. As any file checks the return of the function, this
commit changes the return value to void.

Signed-off-by: Maíra Canal <[email protected]>
---
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 +--
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
index 2676710a5f2b..ed23c7c79d86 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -957,7 +957,7 @@ static void recalculate_params(
}
}

-bool Calculate256BBlockSizes(
+void Calculate256BBlockSizes(
enum source_format_class SourcePixelFormat,
enum dm_swizzle_mode SurfaceTiling,
unsigned int BytePerPixelY,
@@ -995,7 +995,6 @@ bool Calculate256BBlockSizes(
*BlockWidth256BytesY = 256 / BytePerPixelY / *BlockHeight256BytesY;
*BlockWidth256BytesC = 256 / BytePerPixelC / *BlockHeight256BytesC;
}
- return true;
}

bool CalculateMinAndMaxPrefetchMode(
diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
index 10ff536ef2a4..25a9a606ab6f 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
@@ -169,7 +169,7 @@ bool get_is_phantom_pipe(struct display_mode_lib *mode_lib,
unsigned int pipe_idx);
void PixelClockAdjustmentForProgressiveToInterlaceUnit(struct display_mode_lib *mode_lib);

-bool Calculate256BBlockSizes(
+void Calculate256BBlockSizes(
enum source_format_class SourcePixelFormat,
enum dm_swizzle_mode SurfaceTiling,
unsigned int BytePerPixelY,
--
2.36.1

2022-07-05 16:00:41

by Alex Deucher

Subject: Re: [PATCH] drm/amd/display: Remove return value of Calculate256BBlockSizes

Applied. Thanks!

Alex

On Thu, Jun 30, 2022 at 2:50 PM Maíra Canal <[email protected]> wrote:
>
> The function Calculate256BBlockSizes always returns true, regardless of
> the parameters. As any file checks the return of the function, this
> commit changes the return value to void.
>
> Signed-off-by: Maíra Canal <[email protected]>
> ---
> drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c | 3 +--
> drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
> index 2676710a5f2b..ed23c7c79d86 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
> @@ -957,7 +957,7 @@ static void recalculate_params(
> }
> }
>
> -bool Calculate256BBlockSizes(
> +void Calculate256BBlockSizes(
> enum source_format_class SourcePixelFormat,
> enum dm_swizzle_mode SurfaceTiling,
> unsigned int BytePerPixelY,
> @@ -995,7 +995,6 @@ bool Calculate256BBlockSizes(
> *BlockWidth256BytesY = 256 / BytePerPixelY / *BlockHeight256BytesY;
> *BlockWidth256BytesC = 256 / BytePerPixelC / *BlockHeight256BytesC;
> }
> - return true;
> }
>
> bool CalculateMinAndMaxPrefetchMode(
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
> index 10ff536ef2a4..25a9a606ab6f 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
> @@ -169,7 +169,7 @@ bool get_is_phantom_pipe(struct display_mode_lib *mode_lib,
> unsigned int pipe_idx);
> void PixelClockAdjustmentForProgressiveToInterlaceUnit(struct display_mode_lib *mode_lib);
>
> -bool Calculate256BBlockSizes(
> +void Calculate256BBlockSizes(
> enum source_format_class SourcePixelFormat,
> enum dm_swizzle_mode SurfaceTiling,
> unsigned int BytePerPixelY,
> --
> 2.36.1
>