drm/amd/display: turn DPMS off on connector unplug

[ Upstream commit 3c4d55c9b9becedd8d31a7c96783a364533713ab ]

[Why&How]

Set dpms off on the connector that was unplugged, for the side effect of
releasing some references held through deallocation of MST payload. This is
the expected behaviour for non MST devices as well.

Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Eryk Brol <eryk.brol@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

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 ea1ea147f6073ed7aabea02d50d021a3d1df5628..c07737c45677679bc1d17636da03036856176ef2 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1902,6 +1902,33 @@ cleanup:
        return;
 }
 
+static void dm_set_dpms_off(struct dc_link *link)
+{
+       struct dc_stream_state *stream_state;
+       struct amdgpu_dm_connector *aconnector = link->priv;
+       struct amdgpu_device *adev = drm_to_adev(aconnector->base.dev);
+       struct dc_stream_update stream_update;
+       bool dpms_off = true;
+
+       memset(&stream_update, 0, sizeof(stream_update));
+       stream_update.dpms_off = &dpms_off;
+
+       mutex_lock(&adev->dm.dc_lock);
+       stream_state = dc_stream_find_from_link(link);
+
+       if (stream_state == NULL) {
+               DRM_DEBUG_DRIVER("Error finding stream state associated with link!\n");
+               mutex_unlock(&adev->dm.dc_lock);
+               return;
+       }
+
+       stream_update.stream = stream_state;
+       dc_commit_updates_for_stream(stream_state->ctx->dc, NULL, 0,
+                                    stream_state, &stream_update,
+                                    stream_state->ctx->dc->current_state);
+       mutex_unlock(&adev->dm.dc_lock);
+}
+
 static int dm_resume(void *handle)
 {
        struct amdgpu_device *adev = handle;
@@ -2353,8 +2380,11 @@ static void handle_hpd_irq(void *param)
                        drm_kms_helper_hotplug_event(dev);
 
        } else if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {
-               amdgpu_dm_update_connector_after_detect(aconnector);
+               if (new_connection_type == dc_connection_none &&
+                   aconnector->dc_link->type == dc_connection_none)
+                       dm_set_dpms_off(aconnector->dc_link);
 
+               amdgpu_dm_update_connector_after_detect(aconnector);
 
                drm_modeset_lock_all(dev);
                dm_restore_drm_connector_state(dev, connector);

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 45ad05f6e03b9d965e7ea4af841a5f10bfd443d6..ffb21196bf5992a122cae78b6689aec3443ba248 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -2767,6 +2767,19 @@ struct dc_stream_state *dc_get_stream_at_index(struct dc *dc, uint8_t i)
        return NULL;
 }
 
+struct dc_stream_state *dc_stream_find_from_link(const struct dc_link *link)
+{
+       uint8_t i;
+       struct dc_context *ctx = link->ctx;
+
+       for (i = 0; i < ctx->dc->current_state->stream_count; i++) {
+               if (ctx->dc->current_state->streams[i]->link == link)
+                       return ctx->dc->current_state->streams[i];
+       }
+
+       return NULL;
+}
+
 enum dc_irq_source dc_interrupt_to_irq_source(
                struct dc *dc,
                uint32_t src_id,

diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h
index c246af7c584b0ff28833cfcfc0af81dbc09417fa..205bedd1b19663694fd178fda439fb382144e7f7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h
@@ -297,6 +297,7 @@ void dc_stream_log(const struct dc *dc, const struct dc_stream_state *stream);
 
 uint8_t dc_get_current_stream_count(struct dc *dc);
 struct dc_stream_state *dc_get_stream_at_index(struct dc *dc, uint8_t i);
+struct dc_stream_state *dc_stream_find_from_link(const struct dc_link *link);
 
 /*
  * Return the current frame counter.