lkml.org 
[lkml]   [2014]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 075/137] drm/radeon: fix irq ring buffer overflow handling
    Date
    3.11.10.15 -stable review patch.  If anyone has any objections, please let me know.

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

    From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>

    commit e8c214d22e76dd0ead38f97f8d2dc09aac70d651 upstream.

    We must mask out the overflow bit as well, otherwise
    the wptr will never match the rptr again and the interrupt
    handler will loop forever.

    Signed-off-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/radeon/cik.c | 1 +
    drivers/gpu/drm/radeon/evergreen.c | 1 +
    drivers/gpu/drm/radeon/r600.c | 1 +
    drivers/gpu/drm/radeon/si.c | 1 +
    4 files changed, 4 insertions(+)

    diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
    index 85647ab99fb1..0aaaa11b7036 100644
    --- a/drivers/gpu/drm/radeon/cik.c
    +++ b/drivers/gpu/drm/radeon/cik.c
    @@ -5591,6 +5591,7 @@ static inline u32 cik_get_ih_wptr(struct radeon_device *rdev)
    tmp = RREG32(IH_RB_CNTL);
    tmp |= IH_WPTR_OVERFLOW_CLEAR;
    WREG32(IH_RB_CNTL, tmp);
    + wptr &= ~RB_OVERFLOW;
    }
    return (wptr & rdev->ih.ptr_mask);
    }
    diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
    index a34e20921711..415ab58594d9 100644
    --- a/drivers/gpu/drm/radeon/evergreen.c
    +++ b/drivers/gpu/drm/radeon/evergreen.c
    @@ -4597,6 +4597,7 @@ static u32 evergreen_get_ih_wptr(struct radeon_device *rdev)
    tmp = RREG32(IH_RB_CNTL);
    tmp |= IH_WPTR_OVERFLOW_CLEAR;
    WREG32(IH_RB_CNTL, tmp);
    + wptr &= ~RB_OVERFLOW;
    }
    return (wptr & rdev->ih.ptr_mask);
    }
    diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
    index 33b35c9e82be..af588cf27293 100644
    --- a/drivers/gpu/drm/radeon/r600.c
    +++ b/drivers/gpu/drm/radeon/r600.c
    @@ -4429,6 +4429,7 @@ static u32 r600_get_ih_wptr(struct radeon_device *rdev)
    tmp = RREG32(IH_RB_CNTL);
    tmp |= IH_WPTR_OVERFLOW_CLEAR;
    WREG32(IH_RB_CNTL, tmp);
    + wptr &= ~RB_OVERFLOW;
    }
    return (wptr & rdev->ih.ptr_mask);
    }
    diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
    index 3479145e8f47..5a46e269e5d5 100644
    --- a/drivers/gpu/drm/radeon/si.c
    +++ b/drivers/gpu/drm/radeon/si.c
    @@ -6052,6 +6052,7 @@ static inline u32 si_get_ih_wptr(struct radeon_device *rdev)
    tmp = RREG32(IH_RB_CNTL);
    tmp |= IH_WPTR_OVERFLOW_CLEAR;
    WREG32(IH_RB_CNTL, tmp);
    + wptr &= ~RB_OVERFLOW;
    }
    return (wptr & rdev->ih.ptr_mask);
    }
    --
    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-08-18 12:21    [W:4.160 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site