lkml.org 
[lkml]   [2012]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 17/42] drm/radeon/kms: fix fans after resume
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 402976fe51b2d1a58a29ba06fa1ca5ace3a4cdcd upstream.

    On pre-R600 asics, the SpeedFanControl table is not
    executed as part of ASIC_Init as it is on newer asics.

    Fixes:
    https://bugzilla.kernel.org/show_bug.cgi?id=29412

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/atom.c | 15 ++++++++++++++-
    drivers/gpu/drm/radeon/atom.h | 1 +
    2 files changed, 15 insertions(+), 1 deletion(-)

    --- a/drivers/gpu/drm/radeon/atom.c
    +++ b/drivers/gpu/drm/radeon/atom.c
    @@ -1301,8 +1301,11 @@ struct atom_context *atom_parse(struct c

    int atom_asic_init(struct atom_context *ctx)
    {
    + struct radeon_device *rdev = ctx->card->dev->dev_private;
    int hwi = CU16(ctx->data_table + ATOM_DATA_FWI_PTR);
    uint32_t ps[16];
    + int ret;
    +
    memset(ps, 0, 64);

    ps[0] = cpu_to_le32(CU32(hwi + ATOM_FWI_DEFSCLK_PTR));
    @@ -1312,7 +1315,17 @@ int atom_asic_init(struct atom_context *

    if (!CU16(ctx->cmd_table + 4 + 2 * ATOM_CMD_INIT))
    return 1;
    - return atom_execute_table(ctx, ATOM_CMD_INIT, ps);
    + ret = atom_execute_table(ctx, ATOM_CMD_INIT, ps);
    + if (ret)
    + return ret;
    +
    + memset(ps, 0, 64);
    +
    + if (rdev->family < CHIP_R600) {
    + if (CU16(ctx->cmd_table + 4 + 2 * ATOM_CMD_SPDFANCNTL))
    + atom_execute_table(ctx, ATOM_CMD_SPDFANCNTL, ps);
    + }
    + return ret;
    }

    void atom_destroy(struct atom_context *ctx)
    --- a/drivers/gpu/drm/radeon/atom.h
    +++ b/drivers/gpu/drm/radeon/atom.h
    @@ -44,6 +44,7 @@
    #define ATOM_CMD_SETSCLK 0x0A
    #define ATOM_CMD_SETMCLK 0x0B
    #define ATOM_CMD_SETPCLK 0x0C
    +#define ATOM_CMD_SPDFANCNTL 0x39

    #define ATOM_DATA_FWI_PTR 0xC
    #define ATOM_DATA_IIO_PTR 0x32

    --
    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: 2012-04-12 01:31    [W:0.059 / U:0.484 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site