diff options
author | Samuel Li <Samuel.Li@amd.com> | 2018-01-19 12:10:52 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:18:24 -0500 |
commit | e0b5b5ec0bc7b12c019560dade29c79208626768 (patch) | |
tree | c84a8f6f2e54ff5f7ae78d2a608d7cd0191b4625 /drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |
parent | 50af9193b39c47686b64bb59156b8821e2c44beb (diff) |
drm/amdgpu: rename amdgpu_ddc_probe
Add display to the name for consistency.
Signed-off-by: Samuel Li <Samuel.Li@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 8ca3783f2deb..ffc1f6f46913 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |||
@@ -877,7 +877,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) | |||
877 | ret = connector_status_disconnected; | 877 | ret = connector_status_disconnected; |
878 | 878 | ||
879 | if (amdgpu_connector->ddc_bus) | 879 | if (amdgpu_connector->ddc_bus) |
880 | dret = amdgpu_ddc_probe(amdgpu_connector, false); | 880 | dret = amdgpu_display_ddc_probe(amdgpu_connector, false); |
881 | if (dret) { | 881 | if (dret) { |
882 | amdgpu_connector->detected_by_load = false; | 882 | amdgpu_connector->detected_by_load = false; |
883 | amdgpu_connector_free_edid(connector); | 883 | amdgpu_connector_free_edid(connector); |
@@ -998,7 +998,7 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) | |||
998 | } | 998 | } |
999 | 999 | ||
1000 | if (amdgpu_connector->ddc_bus) | 1000 | if (amdgpu_connector->ddc_bus) |
1001 | dret = amdgpu_ddc_probe(amdgpu_connector, false); | 1001 | dret = amdgpu_display_ddc_probe(amdgpu_connector, false); |
1002 | if (dret) { | 1002 | if (dret) { |
1003 | amdgpu_connector->detected_by_load = false; | 1003 | amdgpu_connector->detected_by_load = false; |
1004 | amdgpu_connector_free_edid(connector); | 1004 | amdgpu_connector_free_edid(connector); |
@@ -1401,7 +1401,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) | |||
1401 | /* setup ddc on the bridge */ | 1401 | /* setup ddc on the bridge */ |
1402 | amdgpu_atombios_encoder_setup_ext_encoder_ddc(encoder); | 1402 | amdgpu_atombios_encoder_setup_ext_encoder_ddc(encoder); |
1403 | /* bridge chips are always aux */ | 1403 | /* bridge chips are always aux */ |
1404 | if (amdgpu_ddc_probe(amdgpu_connector, true)) /* try DDC */ | 1404 | /* try DDC */ |
1405 | if (amdgpu_display_ddc_probe(amdgpu_connector, true)) | ||
1405 | ret = connector_status_connected; | 1406 | ret = connector_status_connected; |
1406 | else if (amdgpu_connector->dac_load_detect) { /* try load detection */ | 1407 | else if (amdgpu_connector->dac_load_detect) { /* try load detection */ |
1407 | const struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; | 1408 | const struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; |
@@ -1421,7 +1422,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) | |||
1421 | ret = connector_status_connected; | 1422 | ret = connector_status_connected; |
1422 | } else { | 1423 | } else { |
1423 | /* try non-aux ddc (DP to DVI/HDMI/etc. adapter) */ | 1424 | /* try non-aux ddc (DP to DVI/HDMI/etc. adapter) */ |
1424 | if (amdgpu_ddc_probe(amdgpu_connector, false)) | 1425 | if (amdgpu_display_ddc_probe(amdgpu_connector, |
1426 | false)) | ||
1425 | ret = connector_status_connected; | 1427 | ret = connector_status_connected; |
1426 | } | 1428 | } |
1427 | } | 1429 | } |