lkml.org 
[lkml]   [2017]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 053/197] drm/amdgpu: Add missing lb_vblank_lead_lines setup to DCE-6 path.
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mario Kleiner <mario.kleiner.de@gmail.com>

    commit effaf848b957fbf72a3b6a1ad87f5e031eda0b75 upstream.

    This apparently got lost when implementing the new DCE-6 support
    and would cause failures in pageflip scheduling and timestamping.

    Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
    Cc: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
    @@ -979,7 +979,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) {
    @@ -1091,6 +1091,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 */
    @@ -1120,6 +1122,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 */

    \
     
     \ /
      Last update: 2017-05-24 00:21    [W:4.106 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site