diff options
author | Harry Wentland <harry.wentland@amd.com> | 2018-07-25 09:45:47 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-07-27 10:07:43 -0400 |
commit | d04cc604a66b07eff8fce824fb6c0fdc0875d2e3 (patch) | |
tree | 499dd598b7c1f40483de048104050fe36bb06de7 | |
parent | 116f451c90a94de6203757c117278b99a837d3b5 (diff) |
drm/amd: Add missing fields in atom_integrated_system_info_v1_11
This structure needs to align with structure in atomfirmware table.
Update it.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Dmytro Laktyushkin <dmytro.laktyushkin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/include/atomfirmware.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h index 33b4de4ad66e..4bc118df3bc4 100644 --- a/drivers/gpu/drm/amd/include/atomfirmware.h +++ b/drivers/gpu/drm/amd/include/atomfirmware.h | |||
@@ -1074,7 +1074,7 @@ struct atom_integrated_system_info_v1_11 | |||
1074 | uint16_t dpphy_override; // bit vector, enum of atom_sysinfo_dpphy_override_def | 1074 | uint16_t dpphy_override; // bit vector, enum of atom_sysinfo_dpphy_override_def |
1075 | uint16_t lvds_misc; // enum of atom_sys_info_lvds_misc_def | 1075 | uint16_t lvds_misc; // enum of atom_sys_info_lvds_misc_def |
1076 | uint16_t backlight_pwm_hz; // pwm frequency in hz | 1076 | uint16_t backlight_pwm_hz; // pwm frequency in hz |
1077 | uint8_t memorytype; // enum of atom_sys_mem_type | 1077 | uint8_t memorytype; // enum of atom_dmi_t17_mem_type_def, APU memory type indication. |
1078 | uint8_t umachannelnumber; // number of memory channels | 1078 | uint8_t umachannelnumber; // number of memory channels |
1079 | uint8_t pwr_on_digon_to_de; /* all pwr sequence numbers below are in uint of 4ms */ | 1079 | uint8_t pwr_on_digon_to_de; /* all pwr sequence numbers below are in uint of 4ms */ |
1080 | uint8_t pwr_on_de_to_vary_bl; | 1080 | uint8_t pwr_on_de_to_vary_bl; |
@@ -1084,18 +1084,25 @@ struct atom_integrated_system_info_v1_11 | |||
1084 | uint8_t pwr_on_vary_bl_to_blon; | 1084 | uint8_t pwr_on_vary_bl_to_blon; |
1085 | uint8_t pwr_down_bloff_to_vary_bloff; | 1085 | uint8_t pwr_down_bloff_to_vary_bloff; |
1086 | uint8_t min_allowed_bl_level; | 1086 | uint8_t min_allowed_bl_level; |
1087 | uint8_t htc_hyst_limit; | ||
1088 | uint8_t htc_tmp_limit; | ||
1089 | uint8_t reserved1; | ||
1090 | uint8_t reserved2; | ||
1087 | struct atom_external_display_connection_info extdispconninfo; | 1091 | struct atom_external_display_connection_info extdispconninfo; |
1088 | struct atom_14nm_dpphy_dvihdmi_tuningset dvi_tuningset; | 1092 | struct atom_14nm_dpphy_dvihdmi_tuningset dvi_tuningset; |
1089 | struct atom_14nm_dpphy_dvihdmi_tuningset hdmi_tuningset; | 1093 | struct atom_14nm_dpphy_dvihdmi_tuningset hdmi_tuningset; |
1090 | struct atom_14nm_dpphy_dvihdmi_tuningset hdmi6g_tuningset; | 1094 | struct atom_14nm_dpphy_dvihdmi_tuningset hdmi6g_tuningset; |
1091 | struct atom_14nm_dpphy_dp_tuningset dp_tuningset; | 1095 | struct atom_14nm_dpphy_dp_tuningset dp_tuningset; // rbr 1.62G dp tuning set |
1092 | struct atom_14nm_dpphy_dp_tuningset dp_hbr3_tuningset; | 1096 | struct atom_14nm_dpphy_dp_tuningset dp_hbr3_tuningset; // HBR3 dp tuning set |
1093 | struct atom_camera_data camera_info; | 1097 | struct atom_camera_data camera_info; |
1094 | struct atom_hdmi_retimer_redriver_set dp0_retimer_set; //for DP0 | 1098 | struct atom_hdmi_retimer_redriver_set dp0_retimer_set; //for DP0 |
1095 | struct atom_hdmi_retimer_redriver_set dp1_retimer_set; //for DP1 | 1099 | struct atom_hdmi_retimer_redriver_set dp1_retimer_set; //for DP1 |
1096 | struct atom_hdmi_retimer_redriver_set dp2_retimer_set; //for DP2 | 1100 | struct atom_hdmi_retimer_redriver_set dp2_retimer_set; //for DP2 |
1097 | struct atom_hdmi_retimer_redriver_set dp3_retimer_set; //for DP3 | 1101 | struct atom_hdmi_retimer_redriver_set dp3_retimer_set; //for DP3 |
1098 | uint32_t reserved[108]; | 1102 | struct atom_14nm_dpphy_dp_tuningset dp_hbr_tuningset; //hbr 2.7G dp tuning set |
1103 | struct atom_14nm_dpphy_dp_tuningset dp_hbr2_tuningset; //hbr2 5.4G dp turnig set | ||
1104 | struct atom_14nm_dpphy_dp_tuningset edp_tuningset; //edp tuning set | ||
1105 | uint32_t reserved[66]; | ||
1099 | }; | 1106 | }; |
1100 | 1107 | ||
1101 | 1108 | ||