Patch "drm/amdgpu: Add missing lb_vblank_lead_lines setup to DCE-6 path." has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/amdgpu: Add missing lb_vblank_lead_lines setup to DCE-6 path.
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-add-missing-lb_vblank_lead_lines-setup-to-dce-6-path.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
effaf848b957fbf72a3b6a1ad87f5e031eda0b75Mon Sep 17 00:00:00 2001
From: Mario Kleiner <[email protected]>
Date: Mon, 24 Apr 2017 01:02:46 +0200
Subject: drm/amdgpu: Add missing lb_vblank_lead_lines setup to DCE-6 path.
From: Mario Kleiner <[email protected]>
commit effaf848b957fbf72a3b6a1ad87f5e031eda0b75 upstream.
This apparently got lost when implementing the new DCE-6 support and would cause failures in pageflip scheduling and timestamping.
--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +6 -1
@@ -1050,7 +1050,7 @@ static void dce_v6_0_program_watermarks(u32 priority_a_mark =0 , priority_b_mark =0 ;u32 priority_a_cnt =PRIORITY_OFF ;u32 priority_b_cnt =PRIORITY_OFF ; -u32 tmp, arb_control3; +u32 tmp, arb_control3, lb_vblank_lead_lines =0 ;fixed20_12 a, b, c;if (amdgpu_crtc->base.enabled && num_heads && mode) {
@@ -1162,6 +1162,8 @@ static void dce_v6_0_program_watermarks( c.full =dfixed_div (c, a); priority_b_mark =dfixed_trunc (c); priority_b_cnt |= priority_b_mark &PRIORITY_MARK_MASK ; + + lb_vblank_lead_lines =DIV_ROUND_UP (lb_size, mode->crtc_hdisplay); }/* select wm A */
@@ -1191,6 +1193,9 @@ static void dce_v6_0_program_watermarks(/* save values for DPM */ amdgpu_crtc->line_time = line_time; amdgpu_crtc->wm_high = latency_watermark_a; + +/* Save number of lines the linebuffer leads before the scanout */ + amdgpu_crtc->lb_vblank_lead_lines = lb_vblank_lead_lines; }/* watermark setup */
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/drm-amdgpu-add-missing-lb_vblank_lead_lines-setup-to-dce-6-path.patch queue-4.9/drm-amdgpu-avoid-overflows-divide-by-zero-in-latency_watermark-calculations.patch queue-4.9/drm-amdgpu-make-display-watermark-calculations-more-accurate.patch