lkml.org 
[lkml]   [2015]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 122/185] drm/radeon: SDMA fix hibernation (CI GPU family).
    Date
    3.16.7-ckt15 -stable review patch.  If anyone has any objections, please let me know.

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

    From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse@redhat.com>

    commit 2ba8d1bb8f6b589037f7db1f01144fc80750e8f7 upstream.

    In order for hibernation to reliably work we need to properly turn
    off the SDMA block, sadly after numerous attemps i haven't not found
    proper sequence for clean and full shutdown. So simply reset both
    SDMA block, this makes hibernation works reliably on sea island GPU
    family (CI)

    Hibernation and suspend to ram were tested (several times) on :
    Bonaire
    Hawaii
    Mullins
    Kaveri
    Kabini

    Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
    Reviewed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/radeon/cik_sdma.c | 11 +++++++++++
    1 file changed, 11 insertions(+)

    diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
    index 4208ae639407..f3e0d00a2666 100644
    --- a/drivers/gpu/drm/radeon/cik_sdma.c
    +++ b/drivers/gpu/drm/radeon/cik_sdma.c
    @@ -266,6 +266,17 @@ static void cik_sdma_gfx_stop(struct radeon_device *rdev)
    }
    rdev->ring[R600_RING_TYPE_DMA_INDEX].ready = false;
    rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready = false;
    +
    + /* FIXME use something else than big hammer but after few days can not
    + * seem to find good combination so reset SDMA blocks as it seems we
    + * do not shut them down properly. This fix hibernation and does not
    + * affect suspend to ram.
    + */
    + WREG32(SRBM_SOFT_RESET, SOFT_RESET_SDMA | SOFT_RESET_SDMA1);
    + (void)RREG32(SRBM_SOFT_RESET);
    + udelay(50);
    + WREG32(SRBM_SOFT_RESET, 0);
    + (void)RREG32(SRBM_SOFT_RESET);
    }

    /**

    \
     
     \ /
      Last update: 2015-07-15 12:01    [W:4.112 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site