drm/amd/display: Revert Reduce delay when sink device not able to ACK 00340h write

From Ian Chen
223e365ac60aea701f00aefc24adb3cfd67db1d3 in linux-6.1.y/6.1.16
639f6ad6df7f47db48b59956b469a6917a136afb in mainline linux

diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_link.c b/sys/dev/pci/drm/amd/display/dc/core/dc_link.c
index ffe04ad..5edcc9b 100644 (file)
--- a/sys/dev/pci/drm/amd/display/dc/core/dc_link.c
+++ b/sys/dev/pci/drm/amd/display/dc/core/dc_link.c
@@ -1916,12 +1916,6 @@ struct dc_link *link_create(const struct link_init_data *init_params)
        if (false == dc_link_construct(link, init_params))
                goto construct_fail;
 
-       /*
-        * Must use preferred_link_setting, not reported_link_cap or verified_link_cap,
-        * since struct preferred_link_setting won't be reset after S3.
-        */
-       link->preferred_link_setting.dpcd_source_device_specific_field_support = true;
-
        return link;
 
 construct_fail:

diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c b/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c
index 34d03a9..1f64565 100644 (file)
--- a/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c
+++ b/sys/dev/pci/drm/amd/display/dc/core/dc_link_dp.c
@@ -6591,18 +6591,10 @@ void dpcd_set_source_specific_data(struct dc_link *link)
 
                        uint8_t hblank_size = (uint8_t)link->dc->caps.min_horizontal_blanking_period;
 
-                       if (link->preferred_link_setting.dpcd_source_device_specific_field_support) {
-                               result_write_min_hblank = core_link_write_dpcd(link,
-                                       DP_SOURCE_MINIMUM_HBLANK_SUPPORTED, (uint8_t *)(&hblank_size),
-                                       sizeof(hblank_size));
-
-                               if (result_write_min_hblank == DC_ERROR_UNEXPECTED)
-                                       link->preferred_link_setting.dpcd_source_device_specific_field_support = false;
-                       } else {
-                               DC_LOG_DC("Sink device does not support 00340h DPCD write. Skipping on purpose.\n");
-                       }
+                       result_write_min_hblank = core_link_write_dpcd(link,
+                               DP_SOURCE_MINIMUM_HBLANK_SUPPORTED, (uint8_t *)(&hblank_size),
+                               sizeof(hblank_size));
                }
-
                DC_TRACE_LEVEL_MESSAGE(DAL_TRACE_LEVEL_INFORMATION,
                                                        WPP_BIT_FLAG_DC_DETECTION_DP_CAPS,
                                                        "result=%u link_index=%u enum dce_version=%d DPCD=0x%04X min_hblank=%u branch_dev_id=0x%x branch_dev_name='%c%c%c%c%c%c'",

diff --git a/sys/dev/pci/drm/amd/display/dc/dc_dp_types.h b/sys/dev/pci/drm/amd/display/dc/dc_dp_types.h
index 2c54b6e..296793d 100644 (file)
--- a/sys/dev/pci/drm/amd/display/dc/dc_dp_types.h
+++ b/sys/dev/pci/drm/amd/display/dc/dc_dp_types.h
@@ -149,7 +149,6 @@ struct dc_link_settings {
        enum dc_link_spread link_spread;
        bool use_link_rate_set;
        uint8_t link_rate_set;
-       bool dpcd_source_device_specific_field_support;
 };
 
 union dc_dp_ffe_preset {