drm/amd/display: Create fake sink if needed when commit stream

The problem we're trying to fix is this (and similar):
1) X Desktop with single display
2) VT switch
3) Unplug display
4) VT switch back to X
5) re-plug same display

Before this we'd fail at step 4 when trying to create a dc_stream_state
because of a missing sink. This change will fake a sink in this case.

The same scenario applies to S3 resume.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@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 c42660520871861c503a521e1350639c98193ce7..d2ece343b5fa3d595df564b44b8b484c1890edfb 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -855,6 +855,10 @@ static void handle_hpd_irq(void *param)
         * since (for MST case) MST does this in it's own context.
         */
        mutex_lock(&aconnector->hpd_lock);
+
+       if (aconnector->fake_enable)
+               aconnector->fake_enable = false;
+
        if (dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD)) {
                amdgpu_dm_update_connector_after_detect(aconnector);
 
@@ -2278,6 +2282,25 @@ static void decide_crtc_timing_for_drm_display_mode(
        }
 }
 
+static void create_fake_sink(struct amdgpu_dm_connector *aconnector)
+{
+       struct dc_sink *sink = NULL;
+       struct dc_sink_init_data sink_init_data = { 0 };
+
+       sink_init_data.link = aconnector->dc_link;
+       sink_init_data.sink_signal = aconnector->dc_link->connector_signal;
+
+       sink = dc_sink_create(&sink_init_data);
+       if (!sink)
+               DRM_ERROR("Failed to create sink!\n");
+
+       sink->sink_signal = SIGNAL_TYPE_VIRTUAL;
+       aconnector->fake_enable = true;
+
+       aconnector->dc_sink = sink;
+       aconnector->dc_link->local_sink = sink;
+}
+
 static struct dc_stream_state *create_stream_for_sink(
                struct amdgpu_dm_connector *aconnector,
                const struct drm_display_mode *drm_mode,
@@ -2300,6 +2323,10 @@ static struct dc_stream_state *create_stream_for_sink(
        }
 
        drm_connector = &aconnector->base;
+
+       if (!aconnector->dc_sink)
+               create_fake_sink(aconnector);
+
        stream = dc_create_stream_for_sink(aconnector->dc_sink);
 
        if (stream == NULL) {
@@ -4373,7 +4400,7 @@ static int dm_update_crtcs_state(
                aconnector = amdgpu_dm_find_first_crct_matching_connector(state, crtc, true);
 
                /* TODO This hack should go away */
-               if (aconnector && aconnector->dc_sink) {
+               if (aconnector) {
                        conn_state = drm_atomic_get_connector_state(state,
                                                                    &aconnector->base);
 

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index 8894613e956c4703c8a37d01f699673fc0ab1a9d..630e6cdf84f6d0ae853c381a52e348bcac3db2ca 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -187,6 +187,8 @@ struct amdgpu_dm_connector {
        struct mod_freesync_caps caps;
 
        struct mutex hpd_lock;
+
+       bool fake_enable;
 };
 
 #define to_amdgpu_dm_connector(x) container_of(x, struct amdgpu_dm_connector, base)