lkml.org 
[lkml]   [2011]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[30/38] drm/radeon/kms: retry aux transactions if there are status flags
    3.0-stable review patch.  If anyone has any objections, please let us know.

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

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

    commit 4f332844cc87c5f99c5300f788abbe8a8c731390 upstream.

    If there are error flags in the aux status, retry the transaction.
    This makes aux much more reliable, especially on llano systems.

    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@suse.de>

    ---
    drivers/gpu/drm/radeon/atombios_dp.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    --- a/drivers/gpu/drm/radeon/atombios_dp.c
    +++ b/drivers/gpu/drm/radeon/atombios_dp.c
    @@ -129,7 +129,9 @@ static int radeon_dp_aux_native_write(st
    for (retry = 0; retry < 4; retry++) {
    ret = radeon_process_aux_ch(dig_connector->dp_i2c_bus,
    msg, msg_bytes, NULL, 0, delay, &ack);
    - if (ret < 0)
    + if (ret == -EBUSY)
    + continue;
    + else if (ret < 0)
    return ret;
    if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_ACK)
    return send_bytes;
    @@ -160,7 +162,9 @@ static int radeon_dp_aux_native_read(str
    for (retry = 0; retry < 4; retry++) {
    ret = radeon_process_aux_ch(dig_connector->dp_i2c_bus,
    msg, msg_bytes, recv, recv_bytes, delay, &ack);
    - if (ret < 0)
    + if (ret == -EBUSY)
    + continue;
    + else if (ret < 0)
    return ret;
    if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_ACK)
    return ret;
    @@ -236,7 +240,9 @@ int radeon_dp_i2c_aux_ch(struct i2c_adap
    for (retry = 0; retry < 4; retry++) {
    ret = radeon_process_aux_ch(auxch,
    msg, msg_bytes, reply, reply_bytes, 0, &ack);
    - if (ret < 0) {
    + if (ret == -EBUSY)
    + continue;
    + else if (ret < 0) {
    DRM_DEBUG_KMS("aux_ch failed %d\n", ret);
    return ret;
    }

    --
    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: 2011-10-11 19:07    [W:4.455 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site