lkml.org 
[lkml]   [2013]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 018/115] drm/radeon: fix hdmi mode enable on RS600/RS690/RS740
    Date
    3.5.7.13 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit dcb852905772416e322536ced5cb3c796d176af5 upstream.

    These chips were previously skipped since they are
    pre-R600.

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    [ luis: adjust context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/radeon/r600_hdmi.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
    index 851a477..26ce6c1 100644
    --- a/drivers/gpu/drm/radeon/r600_hdmi.c
    +++ b/drivers/gpu/drm/radeon/r600_hdmi.c
    @@ -489,7 +489,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder)
    offset = dig->afmt->offset;

    /* Older chipsets require setting HDMI and routing manually */
    - if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) {
    + if (ASIC_IS_DCE2(rdev) && !ASIC_IS_DCE3(rdev)) {
    hdmi = HDMI0_ERROR_ACK | HDMI0_ENABLE;
    switch (radeon_encoder->encoder_id) {
    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
    @@ -559,7 +559,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder)
    radeon_irq_set(rdev);

    /* Older chipsets not handled by AtomBIOS */
    - if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) {
    + if (ASIC_IS_DCE2(rdev) && !ASIC_IS_DCE3(rdev)) {
    switch (radeon_encoder->encoder_id) {
    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
    WREG32_P(AVIVO_TMDSA_CNTL, 0,
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-20 14:01    [W:4.678 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site