[Why] Edid parsing functions check if edid is not null themselves. In a case where edid is not present, the structs will be left initialised to 0 so anu possible assigment won't change the detected (or undetected) functionality.
[How] Remove edid pointer checks Signed-off-by: Tomasz Pakuła <[email protected]> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 6218ad911fde..903264b26d1f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -13330,8 +13330,8 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, if (is_monitor_range_invalid(connector)) parse_edid_displayid_vrr(connector, edid); - if (edid && (sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT || - sink->sink_signal == SIGNAL_TYPE_EDP)) { + if (sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT || + sink->sink_signal == SIGNAL_TYPE_EDP) { if (dpcd_caps.allow_invalid_MSA_timing_param) freesync_capable = copy_range_to_amdgpu_connector(connector); @@ -13344,8 +13344,7 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, amdgpu_dm_connector->as_type = ADAPTIVE_SYNC_TYPE_EDP; } - } else if (sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A && - drm_edid) { + } else if (sink->sink_signal == SIGNAL_TYPE_HDMI_TYPE_A) { parse_amd_vsdb_cea(amdgpu_dm_connector, edid, &vsdb_info); if (vsdb_info.freesync_supported) { monitor_range_from_vsdb(&connector->display_info, &vsdb_info); @@ -13356,7 +13355,7 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, if (amdgpu_dm_connector->dc_link) as_type = dm_get_adaptive_sync_support_type(amdgpu_dm_connector->dc_link); - if (as_type == FREESYNC_TYPE_PCON_IN_WHITELIST && drm_edid) { + if (as_type == FREESYNC_TYPE_PCON_IN_WHITELIST) { parse_amd_vsdb_cea(amdgpu_dm_connector, edid, &vsdb_info); if (vsdb_info.freesync_supported) { amdgpu_dm_connector->pack_sdp_v1_3 = true; -- 2.53.0
