On Mon, May 5, 2025 at 7:16 PM Sasha Levin <sas...@kernel.org> wrote:
>
> From: Charlene Liu <charlene....@amd.com>
>
> [ Upstream commit 23ef388a84c72b0614a6c10f866ffeac7e807719 ]
>
> [why]
> failed due to cmdtable not created.
> switch atombios cmdtable as default.
>
> Reviewed-by: Alvin Lee <alvin.l...@amd.com>
> Signed-off-by: Charlene Liu <charlene....@amd.com>
> Signed-off-by: Zaeem Mohamed <zaeem.moha...@amd.com>
> Tested-by: Daniel Wheeler <daniel.whee...@amd.com>
> Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
> Signed-off-by: Sasha Levin <sas...@kernel.org>
Support for DCN 4 was added in 6.11 I think so there is no need to
backport DCN 4.x fixes to kernels older than 6.11.
Alex
> ---
> drivers/gpu/drm/amd/display/dc/bios/command_table2.c | 9 ---------
> .../gpu/drm/amd/display/dc/bios/command_table_helper2.c | 3 +--
> 2 files changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
> b/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
> index f1f672a997d7d..d822cc948bdf2 100644
> --- a/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
> +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
> @@ -103,7 +103,6 @@ static void init_dig_encoder_control(struct bios_parser
> *bp)
> bp->cmd_tbl.dig_encoder_control = encoder_control_digx_v1_5;
> break;
> default:
> - dm_output_to_console("Don't have dig_encoder_control for
> v%d\n", version);
> bp->cmd_tbl.dig_encoder_control = encoder_control_fallback;
> break;
> }
> @@ -241,7 +240,6 @@ static void init_transmitter_control(struct bios_parser
> *bp)
> bp->cmd_tbl.transmitter_control = transmitter_control_v1_7;
> break;
> default:
> - dm_output_to_console("Don't have transmitter_control for
> v%d\n", crev);
> bp->cmd_tbl.transmitter_control =
> transmitter_control_fallback;
> break;
> }
> @@ -409,8 +407,6 @@ static void init_set_pixel_clock(struct bios_parser *bp)
> bp->cmd_tbl.set_pixel_clock = set_pixel_clock_v7;
> break;
> default:
> - dm_output_to_console("Don't have set_pixel_clock for v%d\n",
> - BIOS_CMD_TABLE_PARA_REVISION(setpixelclock));
> bp->cmd_tbl.set_pixel_clock = set_pixel_clock_fallback;
> break;
> }
> @@ -557,7 +553,6 @@ static void init_set_crtc_timing(struct bios_parser *bp)
> set_crtc_using_dtd_timing_v3;
> break;
> default:
> - dm_output_to_console("Don't have set_crtc_timing for v%d\n",
> dtd_version);
> bp->cmd_tbl.set_crtc_timing = NULL;
> break;
> }
> @@ -674,8 +669,6 @@ static void init_enable_crtc(struct bios_parser *bp)
> bp->cmd_tbl.enable_crtc = enable_crtc_v1;
> break;
> default:
> - dm_output_to_console("Don't have enable_crtc for v%d\n",
> - BIOS_CMD_TABLE_PARA_REVISION(enablecrtc));
> bp->cmd_tbl.enable_crtc = NULL;
> break;
> }
> @@ -869,8 +862,6 @@ static void init_set_dce_clock(struct bios_parser *bp)
> bp->cmd_tbl.set_dce_clock = set_dce_clock_v2_1;
> break;
> default:
> - dm_output_to_console("Don't have set_dce_clock for v%d\n",
> - BIOS_CMD_TABLE_PARA_REVISION(setdceclock));
> bp->cmd_tbl.set_dce_clock = NULL;
> break;
> }
> diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> index cb3fd44cb1edf..e0231660f69da 100644
> --- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> +++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
> @@ -79,8 +79,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
> return true;
> #endif
> default:
> - /* Unsupported DCE */
> - BREAK_TO_DEBUGGER();
> + *h = dal_cmd_tbl_helper_dce112_get_table2();
> return false;
> }
> }
> --
> 2.39.5
>
