None of the surrounding code was removed just in case even a small
fraction of it was functional.
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/amd/amdgpu/../display/dc/bios/command_table.c: In function ‘adjust_display_pll_v2’:
drivers/gpu/drm/amd/amdgpu/../display/dc/bios/command_table.c:1459:35: warning: variable ‘params’ set but not used [-Wunused-but-set-variable]
Cc: Harry Wentland <[email protected]>
Cc: Leo Li <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Qinglang Miao <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Lee Jones <[email protected]>
---
drivers/gpu/drm/amd/display/dc/bios/command_table.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table.c b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
index afc10b954ffa7..9d3bc3a073821 100644
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
@@ -1517,20 +1517,14 @@ static enum bp_result adjust_display_pll_v2(
struct bp_adjust_pixel_clock_parameters *bp_params)
{
enum bp_result result = BP_RESULT_FAILURE;
- ADJUST_DISPLAY_PLL_PS_ALLOCATION params = { 0 };
/* We need to convert from KHz units into 10KHz units and then convert
* output pixel clock back 10KHz-->KHz */
uint32_t pixel_clock_10KHz_in = bp_params->pixel_clock / 10;
- params.usPixelClock = cpu_to_le16((uint16_t)(pixel_clock_10KHz_in));
- params.ucTransmitterID =
- bp->cmd_helper->encoder_id_to_atom(
- dal_graphics_object_id_get_encoder_id(
- bp_params->encoder_object_id));
- params.ucEncodeMode =
- (uint8_t)bp->cmd_helper->encoder_mode_bp_to_atom(
- bp_params->signal_type, false);
+ bp->cmd_helper->encoder_id_to_atom(
+ dal_graphics_object_id_get_encoder_id(bp_params->encoder_object_id));
+ bp->cmd_helper->encoder_mode_bp_to_atom(bp_params->signal_type, false);
return result;
}
--
2.27.0
On Wed, Mar 3, 2021 at 8:43 AM Lee Jones <[email protected]> wrote:
>
> None of the surrounding code was removed just in case even a small
> fraction of it was functional.
>
> Fixes the following W=1 kernel build warning(s):
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/bios/command_table.c: In function ‘adjust_display_pll_v2’:
> drivers/gpu/drm/amd/amdgpu/../display/dc/bios/command_table.c:1459:35: warning: variable ‘params’ set but not used [-Wunused-but-set-variable]
>
> Cc: Harry Wentland <[email protected]>
> Cc: Leo Li <[email protected]>
> Cc: Alex Deucher <[email protected]>
> Cc: "Christian König" <[email protected]>
> Cc: David Airlie <[email protected]>
> Cc: Daniel Vetter <[email protected]>
> Cc: Qinglang Miao <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Signed-off-by: Lee Jones <[email protected]>
This function should be calling the atom cmd table with the
parameters. Just sent a patch to fix this:
https://patchwork.freedesktop.org/patch/422833/
Alex
> ---
> drivers/gpu/drm/amd/display/dc/bios/command_table.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table.c b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
> index afc10b954ffa7..9d3bc3a073821 100644
> --- a/drivers/gpu/drm/amd/display/dc/bios/command_table.c
> +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table.c
> @@ -1517,20 +1517,14 @@ static enum bp_result adjust_display_pll_v2(
> struct bp_adjust_pixel_clock_parameters *bp_params)
> {
> enum bp_result result = BP_RESULT_FAILURE;
> - ADJUST_DISPLAY_PLL_PS_ALLOCATION params = { 0 };
>
> /* We need to convert from KHz units into 10KHz units and then convert
> * output pixel clock back 10KHz-->KHz */
> uint32_t pixel_clock_10KHz_in = bp_params->pixel_clock / 10;
>
> - params.usPixelClock = cpu_to_le16((uint16_t)(pixel_clock_10KHz_in));
> - params.ucTransmitterID =
> - bp->cmd_helper->encoder_id_to_atom(
> - dal_graphics_object_id_get_encoder_id(
> - bp_params->encoder_object_id));
> - params.ucEncodeMode =
> - (uint8_t)bp->cmd_helper->encoder_mode_bp_to_atom(
> - bp_params->signal_type, false);
> + bp->cmd_helper->encoder_id_to_atom(
> + dal_graphics_object_id_get_encoder_id(bp_params->encoder_object_id));
> + bp->cmd_helper->encoder_mode_bp_to_atom(bp_params->signal_type, false);
> return result;
> }
>
> --
> 2.27.0
>
> _______________________________________________
> dri-devel mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/dri-devel