lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 003/110] Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell."
    Date
    From: Yifan Zhang <yifan1.zhang@amd.com>

    commit baacf52a473b24e10322b67757ddb92ab8d86717 upstream.

    This reverts commit 1c0b0efd148d5b24c4932ddb3fa03c8edd6097b3.

    Reason for revert: Side effect of enlarging CP_MEC_DOORBELL_RANGE may
    cause some APUs fail to enter gfxoff in certain user cases.

    Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
    index 72d23651501d..2342c5d216f9 100644
    --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
    @@ -6769,12 +6769,8 @@ static int gfx_v10_0_kiq_init_register(struct amdgpu_ring *ring)
    if (ring->use_doorbell) {
    WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
    (adev->doorbell_index.kiq * 2) << 2);
    - /* If GC has entered CGPG, ringing doorbell > first page doesn't
    - * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround
    - * this issue.
    - */
    WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
    - (adev->doorbell.size - 4));
    + (adev->doorbell_index.userqueue_end * 2) << 2);
    }

    WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 16:19    [W:4.408 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site