lkml.org 
[lkml]   [2014]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 186/214] drm/radeon: fix hdmi mode enable on RS600/RS690/RS740
    Date
    3.4-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>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    [wml: Backported to 3.4:
    - adjust context
    - no !ASIC_IS_DCE3(rdev)]
    Signed-off-by: Weng Meiling <wengmeiling.weng@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/radeon/r600_hdmi.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/radeon/r600_hdmi.c
    +++ b/drivers/gpu/drm/radeon/r600_hdmi.c
    @@ -530,7 +530,7 @@ void r600_hdmi_enable(struct drm_encoder
    WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0x1, ~0x1);
    } else if (ASIC_IS_DCE3(rdev)) {
    /* TODO */
    - } else if (rdev->family >= CHIP_R600) {
    + } else if (ASIC_IS_DCE2(rdev)) {
    switch (radeon_encoder->encoder_id) {
    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1:
    WREG32_P(AVIVO_TMDSA_CNTL, AVIVO_TMDSA_CNTL_HDMI_EN,
    @@ -602,7 +602,7 @@ void r600_hdmi_disable(struct drm_encode
    WREG32_P(radeon_encoder->hdmi_config_offset + 0xc, 0, ~0x1);
    } else if (ASIC_IS_DCE32(rdev)) {
    WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0, ~0x1);
    - } else if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) {
    + } else 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,



    \
     
     \ /
      Last update: 2014-06-07 04:21    [W:5.334 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site