From: Greg Kroah-Hartman Date: Sun, 16 Oct 2022 16:58:19 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.219~69 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d043ccaa91064f419e755dd5d759820487a7a055;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: drm-amd-display-fix-vblank-refcount-in-vrr-transition.patch --- diff --git a/queue-5.15/drm-amd-display-fix-vblank-refcount-in-vrr-transition.patch b/queue-5.15/drm-amd-display-fix-vblank-refcount-in-vrr-transition.patch new file mode 100644 index 00000000000..7893339a469 --- /dev/null +++ b/queue-5.15/drm-amd-display-fix-vblank-refcount-in-vrr-transition.patch @@ -0,0 +1,143 @@ +From 8799c0be89ebb99a16098bdf618f49f817bef76a Mon Sep 17 00:00:00 2001 +From: Yunxiang Li +Date: Wed, 21 Sep 2022 17:20:19 -0400 +Subject: drm/amd/display: Fix vblank refcount in vrr transition + +From: Yunxiang Li + +commit 8799c0be89ebb99a16098bdf618f49f817bef76a upstream. + +manage_dm_interrupts disable/enable vblank using drm_crtc_vblank_off/on +which causes drm_crtc_vblank_get in vrr_transition to fail, and later +when drm_crtc_vblank_put is called the refcount on vblank will be messed +up. Therefore move the call to after manage_dm_interrupts. + +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1247 +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1380 + +Tested-by: Daniel Wheeler +Reviewed-by: Rodrigo Siqueira +Signed-off-by: Yunxiang Li +Signed-off-by: Rodrigo Siqueira +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 55 ++++++++++------------ + 1 file changed, 26 insertions(+), 29 deletions(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -8860,15 +8860,15 @@ static void amdgpu_dm_handle_vrr_transit + * We also need vupdate irq for the actual core vblank handling + * at end of vblank. + */ +- dm_set_vupdate_irq(new_state->base.crtc, true); +- drm_crtc_vblank_get(new_state->base.crtc); ++ WARN_ON(dm_set_vupdate_irq(new_state->base.crtc, true) != 0); ++ WARN_ON(drm_crtc_vblank_get(new_state->base.crtc) != 0); + DRM_DEBUG_DRIVER("%s: crtc=%u VRR off->on: Get vblank ref\n", + __func__, new_state->base.crtc->base.id); + } else if (old_vrr_active && !new_vrr_active) { + /* Transition VRR active -> inactive: + * Allow vblank irq disable again for fixed refresh rate. + */ +- dm_set_vupdate_irq(new_state->base.crtc, false); ++ WARN_ON(dm_set_vupdate_irq(new_state->base.crtc, false) != 0); + drm_crtc_vblank_put(new_state->base.crtc); + DRM_DEBUG_DRIVER("%s: crtc=%u VRR on->off: Drop vblank ref\n", + __func__, new_state->base.crtc->base.id); +@@ -9604,23 +9604,6 @@ static void amdgpu_dm_atomic_commit_tail + mutex_unlock(&dm->dc_lock); + } + +- /* Count number of newly disabled CRTCs for dropping PM refs later. */ +- for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, +- new_crtc_state, i) { +- if (old_crtc_state->active && !new_crtc_state->active) +- crtc_disable_count++; +- +- dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); +- dm_old_crtc_state = to_dm_crtc_state(old_crtc_state); +- +- /* For freesync config update on crtc state and params for irq */ +- update_stream_irq_parameters(dm, dm_new_crtc_state); +- +- /* Handle vrr on->off / off->on transitions */ +- amdgpu_dm_handle_vrr_transition(dm_old_crtc_state, +- dm_new_crtc_state); +- } +- + /** + * Enable interrupts for CRTCs that are newly enabled or went through + * a modeset. It was intentionally deferred until after the front end +@@ -9630,16 +9613,29 @@ static void amdgpu_dm_atomic_commit_tail + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) { + struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc); + #ifdef CONFIG_DEBUG_FS +- bool configure_crc = false; + enum amdgpu_dm_pipe_crc_source cur_crc_src; + #if defined(CONFIG_DRM_AMD_SECURE_DISPLAY) +- struct crc_rd_work *crc_rd_wrk = dm->crc_rd_wrk; ++ struct crc_rd_work *crc_rd_wrk; ++#endif ++#endif ++ /* Count number of newly disabled CRTCs for dropping PM refs later. */ ++ if (old_crtc_state->active && !new_crtc_state->active) ++ crtc_disable_count++; ++ ++ dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); ++ dm_old_crtc_state = to_dm_crtc_state(old_crtc_state); ++ ++ /* For freesync config update on crtc state and params for irq */ ++ update_stream_irq_parameters(dm, dm_new_crtc_state); ++ ++#ifdef CONFIG_DEBUG_FS ++#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY) ++ crc_rd_wrk = dm->crc_rd_wrk; + #endif + spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags); + cur_crc_src = acrtc->dm_irq_params.crc_src; + spin_unlock_irqrestore(&adev_to_drm(adev)->event_lock, flags); + #endif +- dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); + + if (new_crtc_state->active && + (!old_crtc_state->active || +@@ -9647,16 +9643,19 @@ static void amdgpu_dm_atomic_commit_tail + dc_stream_retain(dm_new_crtc_state->stream); + acrtc->dm_irq_params.stream = dm_new_crtc_state->stream; + manage_dm_interrupts(adev, acrtc, true); ++ } ++ /* Handle vrr on->off / off->on transitions */ ++ amdgpu_dm_handle_vrr_transition(dm_old_crtc_state, dm_new_crtc_state); + + #ifdef CONFIG_DEBUG_FS ++ if (new_crtc_state->active && ++ (!old_crtc_state->active || ++ drm_atomic_crtc_needs_modeset(new_crtc_state))) { + /** + * Frontend may have changed so reapply the CRC capture + * settings for the stream. + */ +- dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); +- + if (amdgpu_dm_is_valid_crc_source(cur_crc_src)) { +- configure_crc = true; + #if defined(CONFIG_DRM_AMD_SECURE_DISPLAY) + if (amdgpu_dm_crc_window_is_activated(crtc)) { + spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags); +@@ -9668,12 +9667,10 @@ static void amdgpu_dm_atomic_commit_tail + spin_unlock_irqrestore(&adev_to_drm(adev)->event_lock, flags); + } + #endif +- } +- +- if (configure_crc) + if (amdgpu_dm_crtc_configure_crc_source( + crtc, dm_new_crtc_state, cur_crc_src)) + DRM_DEBUG_DRIVER("Failed to configure crc source"); ++ } + #endif + } + } diff --git a/queue-5.15/series b/queue-5.15/series index 63316f8772d..61c8bedef23 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -130,3 +130,4 @@ drm-nouveau-fix-a-use-after-free-in-nouveau_gem_prime_import_sg_table.patch drm-i915-fix-watermark-calculations-for-gen12-rc-ccs-modifier.patch drm-i915-fix-watermark-calculations-for-gen12-mc-ccs-modifier.patch drm-i915-fix-watermark-calculations-for-gen12-ccs-cc-modifier.patch +drm-amd-display-fix-vblank-refcount-in-vrr-transition.patch