From: Jaehyun Chung jaehyun.chung@amd.com
[Why] Stream disable sequence incorretly destroys HDCP session while stream is not blanked and while audio is not muted. This sequence causes a flash of corruption during mode change and an audio click.
[How] Change sequence to blank stream before destroying HDCP session. Audio will also be muted by blanking the stream.
Cc: stable@vger.kernel.org Signed-off-by: Jaehyun Chung jaehyun.chung@amd.com Reviewed-by: Alvin Lee Alvin.Lee2@amd.com Acked-by: Qingqing Zhuo qingqing.zhuo@amd.com --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 4bd6e03a7ef3..117d8aaf2a9b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -3286,12 +3286,11 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx) core_link_set_avmute(pipe_ctx, true); }
+ 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);
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.8, v5.7.13, v5.4.56, v4.19.137, v4.14.192, v4.9.232, v4.4.232.
v5.8: Build OK! v5.7.13: Failed to apply! Possible dependencies: 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream")
v5.4.56: Failed to apply! Possible dependencies: 2b77dcc5e5aa ("drm/amd/display: rename core_dc to dc") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 48af9b91b129 ("drm/amd/display: Don't allocate payloads if link lost") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 7f7652ee8c8c ("drm/amd/display: enable single dp seamless boot") 8cc426d79be1 ("drm/amd/display: Program DSC during timing programming") 9ae1b27f31d0 ("drm/amd/display: fix hotplug during display off") ab4a4072f260 ("drm/amd/display: exit PSR during detection") d4252eee1f7c ("drm/amd/display: Add debugfs entry to force YUV420 output") d462fcf5012b ("drm/amd/display: Update hdcp display config") e0d08a40a63b ("drm/amd/display: Add debugfs entry for reading psr state") e78a312f81c8 ("drm/amd/display: use requested_dispclk_khz instead of clk") ef5a7d266e82 ("drm/amd/display: skip enable stream on disconnected display")
v4.19.137: Failed to apply! Possible dependencies: 11c3ee48bd7c ("drm/amdgpu/display: add support for LVDS (v5)") 1a9e3d4569fc ("drm/amd/display: Set DSC before DIG front-end is connected to its back-end") 1e7e86c43f38 ("drm/amd/display: decouple front and backend pgm using dpms_off as backend enable flag") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 8c3db1284a01 ("drm/amdgpu: fill in amdgpu_dm_remove_sink_from_freesync_module") 98e6436d3af5 ("drm/amd/display: Refactor FreeSync module") aa9c4abe466a ("drm/amd/display: Refactor FPGA-specific link setup")
v4.14.192: Failed to apply! Possible dependencies: 1b0c0f9dc5ca ("drm/amdgpu: move userptr BOs to CPU domain during CS v2") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 3fe89771cb0a ("drm/amdgpu: stop reserving the BO in the MMU callback v3") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 60de1c1740f3 ("drm/amdgpu: use a rw_semaphore for MMU notifiers") 71021265a6f0 ("drm/amd/display: Clear test pattern when enabling stream") 9a18999640fa ("drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h") 9cca0b8e5df0 ("drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping") a216ab09955d ("drm/amdgpu: fix userptr put_page handling") b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2") ca666a3c298f ("drm/amdgpu: stop using BO status for user pages")
v4.9.232: Failed to apply! Possible dependencies: 1cec20f0ea0e ("dma-buf: Restart reservation_object_wait_timeout_rcu() after writes") 248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 71021265a6f0 ("drm/amd/display: Clear test pattern when enabling stream") 78010cd9736e ("dma-buf/fence: add an lockdep_assert_held()") f54d1867005c ("dma-buf: Rename struct fence to dma_fence") fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes")
v4.4.232: Failed to apply! Possible dependencies: 0f477c6dea70 ("staging/android/sync: add sync_fence_create_dma") 1f7371b2a5fa ("drm/amd/powerplay: add basic powerplay framework") 248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag") 288912cb95d1 ("drm/amdgpu: use $(src) in Makefile (v2)") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 375fb53ec1be ("staging: android: replace explicit NULL comparison") 395dec6f6bc5 ("Documentation: add doc for sync_file_get_fence()") 4325198180e5 ("drm/amdgpu: remove GART page addr array") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 62304fb1fc08 ("dma-buf/sync_file: de-stage sync_file") 71021265a6f0 ("drm/amd/display: Clear test pattern when enabling stream") a1d29476d666 ("drm/amdgpu: optionally enable GART debugfs file") a8fe58cec351 ("drm/amd: add ACP driver support") b70f014d58b9 ("drm/amdgpu: change default sched jobs to 32") c784c82a3fd6 ("Documentation: add Sync File doc") d4cab38e153d ("staging/android: prepare sync_file for de-staging") d7fdb0ae9d11 ("staging/android: rename sync_fence to sync_file") f54d1867005c ("dma-buf: Rename struct fence to dma_fence") fac8434dab96 ("Documentation: Fix some grammar mistakes in sync_file.txt") fdba11f4079e ("drm/amdgpu: move all Kconfig options to amdgpu/Kconfig")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.8.1, v5.7.15, v5.4.58, v4.19.139, v4.14.193, v4.9.232, v4.4.232.
v5.8.1: Build OK! v5.7.15: Failed to apply! Possible dependencies: 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream")
v5.4.58: Failed to apply! Possible dependencies: 2b77dcc5e5aa ("drm/amd/display: rename core_dc to dc") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 48af9b91b129 ("drm/amd/display: Don't allocate payloads if link lost") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 7f7652ee8c8c ("drm/amd/display: enable single dp seamless boot") 8cc426d79be1 ("drm/amd/display: Program DSC during timing programming") 9ae1b27f31d0 ("drm/amd/display: fix hotplug during display off") ab4a4072f260 ("drm/amd/display: exit PSR during detection") d4252eee1f7c ("drm/amd/display: Add debugfs entry to force YUV420 output") d462fcf5012b ("drm/amd/display: Update hdcp display config") e0d08a40a63b ("drm/amd/display: Add debugfs entry for reading psr state") e78a312f81c8 ("drm/amd/display: use requested_dispclk_khz instead of clk") ef5a7d266e82 ("drm/amd/display: skip enable stream on disconnected display")
v4.19.139: Failed to apply! Possible dependencies: 11c3ee48bd7c ("drm/amdgpu/display: add support for LVDS (v5)") 1a9e3d4569fc ("drm/amd/display: Set DSC before DIG front-end is connected to its back-end") 1e7e86c43f38 ("drm/amd/display: decouple front and backend pgm using dpms_off as backend enable flag") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 8c3db1284a01 ("drm/amdgpu: fill in amdgpu_dm_remove_sink_from_freesync_module") 98e6436d3af5 ("drm/amd/display: Refactor FreeSync module") aa9c4abe466a ("drm/amd/display: Refactor FPGA-specific link setup")
v4.14.193: Failed to apply! Possible dependencies: 1b0c0f9dc5ca ("drm/amdgpu: move userptr BOs to CPU domain during CS v2") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 3fe89771cb0a ("drm/amdgpu: stop reserving the BO in the MMU callback v3") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 60de1c1740f3 ("drm/amdgpu: use a rw_semaphore for MMU notifiers") 71021265a6f0 ("drm/amd/display: Clear test pattern when enabling stream") 9a18999640fa ("drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h") 9cca0b8e5df0 ("drm/amdgpu: move amdgpu_cs_sysvm_access_required into find_mapping") a216ab09955d ("drm/amdgpu: fix userptr put_page handling") b72cf4fca2bb ("drm/amdgpu: move taking mmap_sem into get_user_pages v2") ca666a3c298f ("drm/amdgpu: stop using BO status for user pages")
v4.9.232: Failed to apply! Possible dependencies: 1cec20f0ea0e ("dma-buf: Restart reservation_object_wait_timeout_rcu() after writes") 248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 71021265a6f0 ("drm/amd/display: Clear test pattern when enabling stream") 78010cd9736e ("dma-buf/fence: add an lockdep_assert_held()") f54d1867005c ("dma-buf: Rename struct fence to dma_fence") fedf54132d24 ("dma-buf: Restart reservation_object_get_fences_rcu() after writes")
v4.4.232: Failed to apply! Possible dependencies: 0f477c6dea70 ("staging/android/sync: add sync_fence_create_dma") 1f7371b2a5fa ("drm/amd/powerplay: add basic powerplay framework") 248a1d6f1ac4 ("drm/amd: fix include notation and remove -Iinclude/drm flag") 288912cb95d1 ("drm/amdgpu: use $(src) in Makefile (v2)") 2f752e914d94 ("drm/amd/display: Remove connect DIG FE to its BE during timing programming") 375fb53ec1be ("staging: android: replace explicit NULL comparison") 395dec6f6bc5 ("Documentation: add doc for sync_file_get_fence()") 4325198180e5 ("drm/amdgpu: remove GART page addr array") 4562236b3bc0 ("drm/amd/dc: Add dc display driver (v2)") 4cf7c42739cc ("drm/amd/display: Set/Reset avmute when disable/enable stream") 62304fb1fc08 ("dma-buf/sync_file: de-stage sync_file") 71021265a6f0 ("drm/amd/display: Clear test pattern when enabling stream") a1d29476d666 ("drm/amdgpu: optionally enable GART debugfs file") a8fe58cec351 ("drm/amd: add ACP driver support") b70f014d58b9 ("drm/amdgpu: change default sched jobs to 32") c784c82a3fd6 ("Documentation: add Sync File doc") d4cab38e153d ("staging/android: prepare sync_file for de-staging") d7fdb0ae9d11 ("staging/android: rename sync_fence to sync_file") f54d1867005c ("dma-buf: Rename struct fence to dma_fence") fac8434dab96 ("Documentation: Fix some grammar mistakes in sync_file.txt") fdba11f4079e ("drm/amdgpu: move all Kconfig options to amdgpu/Kconfig")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
linux-stable-mirror@lists.linaro.org
-
Qingqing Zhuo -
Sasha Levin