lkml.org 
[lkml]   [2011]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[03/70] drm/radeon/kms: fix suspend on rv530 asics
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

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

    From: Alex Deucher <alexdeucher@gmail.com>

    commit 71e16bfbd2b1c63d4d97cc5059694c9346aee340 upstream.

    Apparently only rv515 asics need the workaround
    added in f24d86f1a49505cdea56728b853a5d0a3f8e3d11
    (drm/radeon/kms: fix resume regression for some r5xx laptops).

    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=34709

    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/radeon/atom.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/gpu/drm/radeon/atom.c
    +++ b/drivers/gpu/drm/radeon/atom.c
    @@ -32,6 +32,7 @@
    #include "atom.h"
    #include "atom-names.h"
    #include "atom-bits.h"
    +#include "radeon.h"

    #define ATOM_COND_ABOVE 0
    #define ATOM_COND_ABOVEOREQUAL 1
    @@ -101,7 +102,9 @@ static void debug_print_spaces(int n)
    static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
    uint32_t index, uint32_t data)
    {
    + struct radeon_device *rdev = ctx->card->dev->dev_private;
    uint32_t temp = 0xCDCDCDCD;
    +
    while (1)
    switch (CU8(base)) {
    case ATOM_IIO_NOP:
    @@ -112,7 +115,8 @@ static uint32_t atom_iio_execute(struct
    base += 3;
    break;
    case ATOM_IIO_WRITE:
    - (void)ctx->card->ioreg_read(ctx->card, CU16(base + 1));
    + if (rdev->family == CHIP_RV515)
    + (void)ctx->card->ioreg_read(ctx->card, CU16(base + 1));
    ctx->card->ioreg_write(ctx->card, CU16(base + 1), temp);
    base += 3;
    break;



    \
     
     \ /
      Last update: 2011-04-19 22:19    [W:0.035 / U:0.472 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site