Merge tag 'tty-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_helpers.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index b19dc4cfc0301661a3aa1db6b2f822a6fd6887ca..8403b6a9a77bd0008ab30b67153db5392206a5b6 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -169,6 +169,11 @@ static void get_payload_table(
        mutex_unlock(&mst_mgr->payload_lock);
 }
 
+void dm_helpers_dp_update_branch_info(
+       struct dc_context *ctx,
+       const struct dc_link *link)
+{}
+
 /*
  * Writes payload allocation table in immediate downstream device.
  */
@@ -454,6 +459,22 @@ bool dm_helpers_submit_i2c(
        return result;
 }
 
+bool dm_helpers_is_dp_sink_present(struct dc_link *link)
+{
+       bool dp_sink_present;
+       struct amdgpu_dm_connector *aconnector = link->priv;
+
+       if (!aconnector) {
+               BUG_ON("Failed to found connector for link!");
+               return true;
+       }
+
+       mutex_lock(&aconnector->dm_dp_aux.aux.hw_mutex);
+       dp_sink_present = dc_link_is_dp_sink_present(link);
+       mutex_unlock(&aconnector->dm_dp_aux.aux.hw_mutex);
+       return dp_sink_present;
+}
+
 enum dc_edid_status dm_helpers_read_local_edid(
                struct dc_context *ctx,
                struct dc_link *link,
@@ -498,8 +519,8 @@ enum dc_edid_status dm_helpers_read_local_edid(
                                edid_status,
                                aconnector->base.name);
        if (link->aux_mode) {
-               union test_request test_request = {0};
-               union test_response test_response = {0};
+               union test_request test_request = { {0} };
+               union test_response test_response = { {0} };
 
                dm_helpers_dp_read_dpcd(ctx,
                                        link,