OSDN Git Service

drm/amd/display: Add DCN2 BIOS parsing
authorHarry Wentland <harry.wentland@amd.com>
Fri, 22 Feb 2019 14:58:49 +0000 (09:58 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 21 Jun 2019 23:59:34 +0000 (18:59 -0500)
Handle BIOS parsing for DCN2

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c

index 12bc7ee..99f40b8 100644 (file)
@@ -1400,6 +1400,10 @@ static enum bp_result get_integrated_info_v11(
        info->ma_channel_number = info_v11->umachannelnumber;
        info->lvds_ss_percentage =
        le16_to_cpu(info_v11->lvds_ss_percentage);
+#ifdef CONFIG_DRM_AMD_DC_DCN2_0
+       info->dp_ss_control =
+       le16_to_cpu(info_v11->reserved1);
+#endif
        info->lvds_sspread_rate_in_10hz =
        le16_to_cpu(info_v11->lvds_ss_rate_10hz);
        info->hdmi_ss_percentage =
index 53deba4..f9439df 100644 (file)
@@ -61,6 +61,12 @@ 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_DCN2_0)
+       case DCN_VERSION_2_0:
+               *h = dal_cmd_tbl_helper_dce112_get_table2();
+               return true;
+#endif
        case DCE_VERSION_12_0:
        case DCE_VERSION_12_1:
                *h = dal_cmd_tbl_helper_dce112_get_table2();