summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2020-08-26 12:41:46 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2020-08-26 12:41:46 +0000
commit9a8f7e438955cb337a861b9cb50a89f0dcc012bd (patch)
tree7dda34834a56f71c300d2dc3f89b1294d3e462e2 /sys
parent5815ba2545b8398d2474f439dd190f3a477077a9 (diff)
drm/amd/display: Blank stream before destroying HDCP session
From Jaehyun Chung cdda25b43e0efb8df20a6f9956ff9091a1355328 in linux 5.7.y/5.7.18 79940e4d10df9c737a394630968471c632246ee0 in mainline linux
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/amd/display/dc/core/dc_link.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_link.c b/sys/dev/pci/drm/amd/display/dc/core/dc_link.c
index 268ea2ad0b1..cd6652d9687 100644
--- a/sys/dev/pci/drm/amd/display/dc/core/dc_link.c
+++ b/sys/dev/pci/drm/amd/display/dc/core/dc_link.c
@@ -3113,12 +3113,11 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx)
dc_is_virtual_signal(pipe_ctx->stream->signal))
return;
+ dc->hwss.blank_stream(pipe_ctx);
#if defined(CONFIG_DRM_AMD_DC_HDCP)
update_psp_stream_config(pipe_ctx, true);
#endif
- dc->hwss.blank_stream(pipe_ctx);
-
if (pipe_ctx->stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
deallocate_mst_payload(pipe_ctx);