7 files changed, 15 insertions, 9 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 8a078f4ae73d..28bccceaa363 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2708,7 +2708,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
         amdgpu_irq_disable_all(adev);
         if (adev->mode_info.mode_config_initialized){
                 if (!amdgpu_device_has_dc_support(adev))
-                        drm_crtc_force_disable_all(adev->ddev);
+                        drm_helper_force_disable_all(adev->ddev);
                 else
                         drm_atomic_helper_shutdown(adev->ddev);
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index e9934de1b9cf..dd30f4e61a8c 100644
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 
+#include <drm/drm_util.h>
+
 #define ATOM_DEBUG
 
 #include "atom.h"
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 4cfecdce29a3..1f0426d2fc2a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -1682,7 +1682,7 @@ static void dce_v10_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v10_0_audio_write_sad_regs(encoder);
         dce_v10_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 7c868916d90f..2280b971d758 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -1724,7 +1724,7 @@ static void dce_v11_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v11_0_audio_write_sad_regs(encoder);
         dce_v11_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 17eaaba36017..db443ec53d3a 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -1423,6 +1423,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder,
         struct amdgpu_device *adev = dev->dev_private;
         struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);
         struct amdgpu_encoder_atom_dig *dig = amdgpu_encoder->enc_priv;
+        struct drm_connector *connector = amdgpu_get_connector_for_encoder(encoder);
         struct hdmi_avi_infoframe frame;
         u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE];
         uint8_t *payload = buffer + 3;
@@ -1430,7 +1431,7 @@ static void dce_v6_0_audio_set_avi_infoframe(struct drm_encoder *encoder,
         ssize_t err;
         u32 tmp;
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 8c0576978d36..13da915991dd 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -1616,7 +1616,7 @@ static void dce_v8_0_afmt_setmode(struct drm_encoder *encoder,
         dce_v8_0_audio_write_sad_regs(encoder);
         dce_v8_0_audio_write_latency_fields(encoder, mode);
 
-        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, mode, false);
+        err = drm_hdmi_avi_infoframe_from_display_mode(&frame, connector, mode);
         if (err < 0) {
                 DRM_ERROR("failed to setup AVI infoframe: %zd\n", err);
                 return;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 5e7ca1f3a8d1..24632727e127 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -191,6 +191,7 @@ dm_dp_mst_connector_destroy(struct drm_connector *connector)
         drm_encoder_cleanup(&amdgpu_encoder->base);
         kfree(amdgpu_encoder);
         drm_connector_cleanup(connector);
+        drm_dp_mst_put_port_malloc(amdgpu_dm_connector->port);
         kfree(amdgpu_dm_connector);
 }
 
@@ -363,7 +364,9 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
         amdgpu_dm_connector_funcs_reset(connector);
 
         DRM_INFO("DM_MST: added connector: %p [id: %d] [master: %p]\n",
-                        aconnector, connector->base.id, aconnector->mst_port);
+                 aconnector, connector->base.id, aconnector->mst_port);
+
+        drm_dp_mst_get_port_malloc(port);
 
         DRM_DEBUG_KMS(":%d\n", connector->base.id);
 
@@ -379,12 +382,12 @@ static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
         struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
 
         DRM_INFO("DM_MST: Disabling connector: %p [id: %d] [master: %p]\n",
-                                aconnector, connector->base.id, aconnector->mst_port);
+                 aconnector, connector->base.id, aconnector->mst_port);
 
-        aconnector->port = NULL;
         if (aconnector->dc_sink) {
                 amdgpu_dm_update_freesync_caps(connector, NULL);
-                dc_link_remove_remote_sink(aconnector->dc_link, aconnector->dc_sink);
+                dc_link_remove_remote_sink(aconnector->dc_link,
+                                           aconnector->dc_sink);
                 dc_sink_release(aconnector->dc_sink);
                 aconnector->dc_sink = NULL;
         }