drm/amd/display: Add DCN3 Command Table Helpers

-Handle DCN3 cases for bios parser and command tables
-Add command function tables for DCN3

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
index 7fb62780e8cf56688e92d6192c099b30c2aaeb0d..150cdbc02d445d425d98ee536ed9aabe200a7483 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
@@ -1154,6 +1154,9 @@ static enum bp_result bios_parser_get_firmware_info(
                                result = get_firmware_info_v3_2(bp, info);
                                break;
                        case 3:
+#ifdef CONFIG_DRM_AMD_DC_DCN3_0
+                       case 4:
+#endif
                                result = get_firmware_info_v3_2(bp, info);
                                break;
                        default:

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 204d7942a6e5c6500e5e8ab7a6e019073b03c6c1..21ff6b686f5f817b5c8ba7bce0e2b080b5ec806a 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
@@ -65,6 +65,11 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
                *h = dal_cmd_tbl_helper_dce112_get_table2();
                return true;
 #endif
+#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+       case DCN_VERSION_3_0:
+               *h = dal_cmd_tbl_helper_dce112_get_table2();
+               return true;
+#endif
 
        default:
                /* Unsupported DCE */

diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c
index 755b6e33140a2d1a09ed37055ce5c42b03dc3a49..bf0affef893f978ec2477d4c5b82eaf9683675d9 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c
@@ -388,3 +388,43 @@ const struct command_table_helper *dal_cmd_tbl_helper_dce112_get_table2(void)
 {
        return &command_table_helper_funcs;
 }
+
+#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+/* function table */
+static const struct command_table_helper command_table_helper_funcs_dcn2x = {
+       .controller_id_to_atom = dal_cmd_table_helper_controller_id_to_atom2,
+       .encoder_action_to_atom = encoder_action_to_atom,
+       .engine_bp_to_atom = engine_bp_to_atom,
+       .clock_source_id_to_atom = clock_source_id_to_atom,
+       .clock_source_id_to_atom_phy_clk_src_id =
+                       clock_source_id_to_atom_phy_clk_src_id,
+       .signal_type_to_atom_dig_mode = signal_type_to_atom_dig_mode,
+       .hpd_sel_to_atom = hpd_sel_to_atom,
+       .dig_encoder_sel_to_atom = dig_encoder_sel_to_atom,
+       .phy_id_to_atom = phy_id_to_atom,
+       .disp_power_gating_action_to_atom = disp_power_gating_action_to_atom,
+       .clock_source_id_to_ref_clk_src = NULL,
+       .transmitter_bp_to_atom = NULL,
+       .encoder_id_to_atom = dal_cmd_table_helper_encoder_id_to_atom2,
+       .encoder_mode_bp_to_atom =
+                       dal_cmd_table_helper_encoder_mode_bp_to_atom2,
+       .dc_clock_type_to_atom = dc_clock_type_to_atom,
+       .transmitter_color_depth_to_atom = transmitter_color_depth_to_atom,
+
+};
+
+/*
+ * dal_cmd_tbl_helper_dce110_get_table
+ *
+ * @brief
+ * Initialize command table helper functions
+ *
+ * @param
+ * const struct command_table_helper **h - [out] struct of functions
+ *
+ */
+const struct command_table_helper *dal_cmd_tbl_helper_dcn2_get_table2(void)
+{
+       return &command_table_helper_funcs_dcn2x;
+}
+#endif

diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.h b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.h
index abf28a06f5bca2ea4b3fa4588f33ab8f685d0e15..2d9e9f3c579d00d44ac515d252140d3e485eae11 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.h
+++ b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.h
@@ -30,5 +30,8 @@ struct command_table_helper;
 
 /* Initialize command table helper functions */
 const struct command_table_helper *dal_cmd_tbl_helper_dce112_get_table2(void);
+#if defined(CONFIG_DRM_AMD_DC_DCN3_0)
+const struct command_table_helper *dal_cmd_tbl_helper_dcn2_get_table2(void);
+#endif
 
 #endif /* __DAL_COMMAND_TABLE_HELPER_DCE110_H__ */