summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSung Joon Kim <sungkim@amd.com>2021-11-08 11:19:14 -0500
committerAlex Deucher <alexander.deucher@amd.com>2021-11-22 14:45:02 -0500
commited12f3f198cedbb164129991766e1a42eecc0bac (patch)
tree074976f2d681f464663727f4377ba81f4337c8ea
parente90f0bb0c7c7099a0222b00f1dd882d349f9d857 (diff)
downloadlinux-stable-ed12f3f198cedbb164129991766e1a42eecc0bac.tar.gz
linux-stable-ed12f3f198cedbb164129991766e1a42eecc0bac.tar.bz2
linux-stable-ed12f3f198cedbb164129991766e1a42eecc0bac.zip
drm/amd/display: Revert "retain/release stream pointer in link enc table"
[why] Change causing issue. Need to revert the change. Reviewed-by: Aric Cyr <Aric.Cyr@amd.com> Acked-by: Wayne Lin <wayne.lin@amd.com> Signed-off-by: Sung Joon Kim <sungkim@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c
index d3c789f26a02..8b319992c71d 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c
@@ -122,7 +122,6 @@ static void remove_link_enc_assignment(
stream->link_enc = NULL;
state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i].eng_id = ENGINE_ID_UNKNOWN;
state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i].stream = NULL;
- dc_stream_release(stream);
break;
}
}
@@ -145,7 +144,6 @@ static void add_link_enc_assignment(
*/
for (i = 0; i < state->stream_count; i++) {
if (stream == state->streams[i]) {
- dc_stream_retain(stream);
state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i] = (struct link_enc_assignment){
.valid = true,
.ep_id = (struct display_endpoint_id) {