drm/amd/display: Update dc_connection_dac_load to dc_connection_analog_load

Update to a more accurate name dc_connection_analog_load.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Chenyu Chen <chen-yu.chen@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 ccb45fb37f8d0ee725ab4b1c8f5d538103c876c6..06b97029001b57ba26a71262c0d7732973ff5e28 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7430,7 +7430,7 @@ amdgpu_dm_connector_poll(struct amdgpu_dm_connector *aconnector, bool force)
         *
         * Only allow to poll such a connector again when forcing.
         */
-       if (!force && link->local_sink && link->type == dc_connection_dac_load)
+       if (!force && link->local_sink && link->type == dc_connection_analog_load)
                return connector->status;
 
        mutex_lock(&aconnector->hpd_lock);

diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 3e924ee0811df2c54b49e53fe39087873a0699e9..b3b785f1897dc51614df577f36a07a1f9ca44f60 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -355,7 +355,7 @@ enum dc_connection_type {
        dc_connection_single,
        dc_connection_mst_branch,
        dc_connection_sst_branch,
-       dc_connection_dac_load
+       dc_connection_analog_load
 };
 
 struct dc_csc_adjustments {

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_detection.c b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
index bfb5c1c886a5fa3f8e37dfe2c5d4f5f60d11a31a..af1b456ac94e6ee01a8c5d167bcd60bfe19881c8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
@@ -1174,7 +1174,7 @@ static bool detect_link_and_local_sink(struct dc_link *link,
                                /* If we didn't do DAC load detection yet, do it now
                                 * to verify there really is a display connected.
                                 */
-                               if (link->type != dc_connection_dac_load &&
+                               if (link->type != dc_connection_analog_load &&
                                        !link_detect_dac_load_detect(link)) {
                                        if (prev_sink)
                                                dc_sink_release(prev_sink);
@@ -1183,7 +1183,7 @@ static bool detect_link_and_local_sink(struct dc_link *link,
                                }
 
                                DC_LOG_INFO("%s detected analog display without EDID\n", __func__);
-                               link->type = dc_connection_dac_load;
+                               link->type = dc_connection_analog_load;
                                sink->edid_caps.analog = true;
                                break;
                        }
@@ -1370,7 +1370,7 @@ static bool detect_link_and_local_sink(struct dc_link *link,
  * @link: DC link to evaluate (must support analog signalling).
  * @type: Updated with the detected connection type:
  *        dc_connection_single (analog via DDC),
- *        dc_connection_dac_load (via load-detect),
+ *        dc_connection_analog_load (via load-detect),
  *        or dc_connection_none.
  *
  * Return: true if detection completed.
@@ -1386,7 +1386,7 @@ static bool link_detect_connection_type_analog(struct dc_link *link, enum dc_con
        }
 
        if (link_detect_dac_load_detect(link)) {
-               *type = dc_connection_dac_load;
+               *type = dc_connection_analog_load;
                return true;
        }