lkml.org 
[lkml]   [2016]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 082/143] drm/amd/amdgpu: compute ring test fail during S4 on CI
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

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

    From: jimqu <Jim.Qu@amd.com>

    commit 53960b4f89db58bc155d6f8aa0a44ccc59ccb26f upstream.

    unhalt Instrction Fetch Unit after all rings are inited.

    Signed-off-by: JimQu <Jim.Qu@amd.com>
    Reviewed-by: 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/gfx_v7_0.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
    @@ -2777,8 +2777,7 @@ static int gfx_v7_0_cp_compute_resume(st
    u64 wb_gpu_addr;
    u32 *buf;
    struct bonaire_mqd *mqd;
    -
    - gfx_v7_0_cp_compute_enable(adev, true);
    + struct amdgpu_ring *ring;

    /* fix up chicken bits */
    tmp = RREG32(mmCP_CPF_DEBUG);
    @@ -2813,7 +2812,7 @@ static int gfx_v7_0_cp_compute_resume(st

    /* init the queues. Just two for now. */
    for (i = 0; i < adev->gfx.num_compute_rings; i++) {
    - struct amdgpu_ring *ring = &adev->gfx.compute_ring[i];
    + ring = &adev->gfx.compute_ring[i];

    if (ring->mqd_obj == NULL) {
    r = amdgpu_bo_create(adev,
    @@ -2992,6 +2991,13 @@ static int gfx_v7_0_cp_compute_resume(st
    amdgpu_bo_unreserve(ring->mqd_obj);

    ring->ready = true;
    + }
    +
    + gfx_v7_0_cp_compute_enable(adev, true);
    +
    + for (i = 0; i < adev->gfx.num_compute_rings; i++) {
    + ring = &adev->gfx.compute_ring[i];
    +
    r = amdgpu_ring_test_ring(ring);
    if (r)
    ring->ready = false;

    \
     
     \ /
      Last update: 2016-09-17 09:58    [W:4.084 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site