[PATCH 09/26] drm/amd/display: Prevent master programming in multisync

[Harry Wentland]

From: Mikita Lipski <mikita.lip...@amd.com>

Verify that the stream is master - and program only the slave displays

Signed-off-by: Mikita Lipski <mikita.lip...@amd.com>
Reviewed-by: Tony Cheng <tony.ch...@amd.com>
Acked-by: Harry Wentland <harry.wentl...@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c         | 2 +-
 drivers/gpu/drm/amd/display/dc/core/dc.c                  | 4 +++-
 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 8f3b06aaafd4..f0b9660658fb 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2353,7 +2353,7 @@ static void set_master_stream(struct dc_stream_state 
*stream_set[],
                }
        }
        for (j = 0;  j < stream_count; j++) {
-               if (stream_set[j] && j != master_stream)
+               if (stream_set[j])
                        stream_set[j]->triggered_crtc_reset.event_source = 
stream_set[master_stream];
        }
 }
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c 
b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 59ad71a8ced0..7938c1746841 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -521,11 +521,13 @@ static void enable_timing_multisync(
                if (!ctx->res_ctx.pipe_ctx[i].stream ||
                                
!ctx->res_ctx.pipe_ctx[i].stream->triggered_crtc_reset.enabled)
                        continue;
+               if (ctx->res_ctx.pipe_ctx[i].stream == 
ctx->res_ctx.pipe_ctx[i].stream->triggered_crtc_reset.event_source)
+                       continue;
                multisync_pipes[multisync_count] = &ctx->res_ctx.pipe_ctx[i];
                multisync_count++;
        }
 
-       if (multisync_count > 1) {
+       if (multisync_count > 0) {
                dc->hwss.enable_per_frame_crtc_position_reset(
                        dc, multisync_count, multisync_pipes);
        }
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c 
b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 52e31e798921..0f5a22e3a491 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -1097,7 +1097,7 @@ static void dcn10_enable_per_frame_crtc_position_reset(
 
        DC_SYNC_INFO("Waiting for trigger\n");
 
-       for (i = 1; i < group_size; i++)
+       for (i = 0; i < group_size; i++)
                wait_for_reset_trigger_to_occur(dc_ctx, 
grouped_pipes[i]->stream_res.tg);
 
        DC_SYNC_INFO("Multi-display sync is complete\n");
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx