drm/amd/display: fix dcn4x init failed

[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>

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 2c96a5e645677407af334d0e21ccac4e37052fc2..2c645dffec185afef5884551f5fa434d26207f92 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;
        }
@@ -239,7 +238,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;
        }
@@ -454,8 +452,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;
        }
@@ -600,7 +596,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;
        }
@@ -717,8 +712,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;
        }
@@ -910,8 +903,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 bad4e4711b4fb6cd36e56797bff70fac429f1f79..268e2414b34f033e02595b340ef8c24aefd467ca 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
@@ -88,8 +88,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;
        }
 }