lkml.org 
[lkml]   [2014]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 075/160] drm/radeon: fix count in cik_sdma_ring_test()
    Date
    3.13.11.3 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Alex Deucher <alexdeucher@gmail.com>

    commit 7e95cfb0b797678cd3493ca0322ef2675547a0bc upstream.

    Should be 5 rather than 4.

    Noticed-by: Mathias Fröhlich <Mathias.Froehlich@gmx.net>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/radeon/cik_sdma.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c
    index 2e0c7a8..d528dcf 100644
    --- a/drivers/gpu/drm/radeon/cik_sdma.c
    +++ b/drivers/gpu/drm/radeon/cik_sdma.c
    @@ -526,7 +526,7 @@ int cik_sdma_ring_test(struct radeon_device *rdev,
    tmp = 0xCAFEDEAD;
    writel(tmp, ptr);

    - r = radeon_ring_lock(rdev, ring, 4);
    + r = radeon_ring_lock(rdev, ring, 5);
    if (r) {
    DRM_ERROR("radeon: dma failed to lock ring %d (%d).\n", ring->idx, r);
    return r;
    --
    1.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-06-10 22:41    [W:2.797 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site