drm/amd/display: fix dcn4x init failed

[ Upstream commit 23ef388a84c72b0614a6c10f866ffeac7e807719 ]

[why]
failed due to cmdtable not created.
switch atombios cmdtable as default.

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Signed-off-by: Charlene Liu <Charlene.Liu@amd.com>
Signed-off-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

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 7d18f372ce7ab483e5841c6ad8b790441f1d8edc..6bc59b7ef007b9753ec145474b72b11aab048af7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table2.c
@@ -101,7 +101,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;
        }
@@ -238,7 +237,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;
        }
@@ -408,8 +406,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;
        }
@@ -554,7 +550,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;
        }
@@ -671,8 +666,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;
        }
@@ -864,8 +857,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 73458e2951034a66059c08f1d052986e688473e5..df8139bda142bff8b53bed9ae7562707ef0c0f12 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
@@ -87,8 +87,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
                return true;
 
        default:
-               /* Unsupported DCE */
-               BREAK_TO_DEBUGGER();
+               *h = dal_cmd_tbl_helper_dce112_get_table2();
                return false;
        }
 }