lkml.org 
[lkml]   [2011]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[41/80] drm/radeon/kms: add some loop timeouts in pageflip code
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Alex Deucher <alexander.deucher@amd.com>

    commit f64964796dedca340608fb1075ab6baad5625851 upstream.

    Avoid infinite loops waiting for surface updates if a GPU
    reset happens while waiting for a page flip.

    See:
    https://bugs.freedesktop.org/show_bug.cgi?id=43191

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
    Tested-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/radeon/evergreen.c | 7 ++++++-
    drivers/gpu/drm/radeon/r100.c | 7 ++++++-
    drivers/gpu/drm/radeon/rs600.c | 7 ++++++-
    drivers/gpu/drm/radeon/rv770.c | 7 ++++++-
    4 files changed, 24 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/radeon/evergreen.c
    +++ b/drivers/gpu/drm/radeon/evergreen.c
    @@ -82,6 +82,7 @@ u32 evergreen_page_flip(struct radeon_de
    {
    struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
    u32 tmp = RREG32(EVERGREEN_GRPH_UPDATE + radeon_crtc->crtc_offset);
    + int i;

    /* Lock the graphics update lock */
    tmp |= EVERGREEN_GRPH_UPDATE_LOCK;
    @@ -99,7 +100,11 @@ u32 evergreen_page_flip(struct radeon_de
    (u32)crtc_base);

    /* Wait for update_pending to go high. */
    - while (!(RREG32(EVERGREEN_GRPH_UPDATE + radeon_crtc->crtc_offset) & EVERGREEN_GRPH_SURFACE_UPDATE_PENDING));
    + for (i = 0; i < rdev->usec_timeout; i++) {
    + if (RREG32(EVERGREEN_GRPH_UPDATE + radeon_crtc->crtc_offset) & EVERGREEN_GRPH_SURFACE_UPDATE_PENDING)
    + break;
    + udelay(1);
    + }
    DRM_DEBUG("Update pending now high. Unlocking vupdate_lock.\n");

    /* Unlock the lock, so double-buffering can take place inside vblank */
    --- a/drivers/gpu/drm/radeon/r100.c
    +++ b/drivers/gpu/drm/radeon/r100.c
    @@ -84,13 +84,18 @@ u32 r100_page_flip(struct radeon_device
    {
    struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
    u32 tmp = ((u32)crtc_base) | RADEON_CRTC_OFFSET__OFFSET_LOCK;
    + int i;

    /* Lock the graphics update lock */
    /* update the scanout addresses */
    WREG32(RADEON_CRTC_OFFSET + radeon_crtc->crtc_offset, tmp);

    /* Wait for update_pending to go high. */
    - while (!(RREG32(RADEON_CRTC_OFFSET + radeon_crtc->crtc_offset) & RADEON_CRTC_OFFSET__GUI_TRIG_OFFSET));
    + for (i = 0; i < rdev->usec_timeout; i++) {
    + if (RREG32(RADEON_CRTC_OFFSET + radeon_crtc->crtc_offset) & RADEON_CRTC_OFFSET__GUI_TRIG_OFFSET)
    + break;
    + udelay(1);
    + }
    DRM_DEBUG("Update pending now high. Unlocking vupdate_lock.\n");

    /* Unlock the lock, so double-buffering can take place inside vblank */
    --- a/drivers/gpu/drm/radeon/rs600.c
    +++ b/drivers/gpu/drm/radeon/rs600.c
    @@ -62,6 +62,7 @@ u32 rs600_page_flip(struct radeon_device
    {
    struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
    u32 tmp = RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset);
    + int i;

    /* Lock the graphics update lock */
    tmp |= AVIVO_D1GRPH_UPDATE_LOCK;
    @@ -74,7 +75,11 @@ u32 rs600_page_flip(struct radeon_device
    (u32)crtc_base);

    /* Wait for update_pending to go high. */
    - while (!(RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset) & AVIVO_D1GRPH_SURFACE_UPDATE_PENDING));
    + for (i = 0; i < rdev->usec_timeout; i++) {
    + if (RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset) & AVIVO_D1GRPH_SURFACE_UPDATE_PENDING)
    + break;
    + udelay(1);
    + }
    DRM_DEBUG("Update pending now high. Unlocking vupdate_lock.\n");

    /* Unlock the lock, so double-buffering can take place inside vblank */
    --- a/drivers/gpu/drm/radeon/rv770.c
    +++ b/drivers/gpu/drm/radeon/rv770.c
    @@ -47,6 +47,7 @@ u32 rv770_page_flip(struct radeon_device
    {
    struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc_id];
    u32 tmp = RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset);
    + int i;

    /* Lock the graphics update lock */
    tmp |= AVIVO_D1GRPH_UPDATE_LOCK;
    @@ -66,7 +67,11 @@ u32 rv770_page_flip(struct radeon_device
    (u32)crtc_base);

    /* Wait for update_pending to go high. */
    - while (!(RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset) & AVIVO_D1GRPH_SURFACE_UPDATE_PENDING));
    + for (i = 0; i < rdev->usec_timeout; i++) {
    + if (RREG32(AVIVO_D1GRPH_UPDATE + radeon_crtc->crtc_offset) & AVIVO_D1GRPH_SURFACE_UPDATE_PENDING)
    + break;
    + udelay(1);
    + }
    DRM_DEBUG("Update pending now high. Unlocking vupdate_lock.\n");

    /* Unlock the lock, so double-buffering can take place inside vblank */



    \
     
     \ /
      Last update: 2011-12-07 17:37    [W:4.100 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site