lkml.org 
[lkml]   [2012]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 68/68] drm/radeon: fix load detect on rn50 with hardcoded EDIDs.
    3.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Dave Airlie <airlied@redhat.com>

    commit a09d431f344d854e4fe9cfac44f78cb8202f3eb7 upstream.

    When the force changes went in back in 3.3.0, we ended up returning
    disconnected in the !force case, and the connected in when forced,
    as it hit the hardcoded check.

    Fix it so all exits go via the hardcoded check and stop spurious
    modesets on platforms with hardcoded EDIDs.

    Reported-by: Evan McNabb (Red Hat)
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/radeon_connectors.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/radeon/radeon_connectors.c
    +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
    @@ -976,6 +976,7 @@ radeon_dvi_detect(struct drm_connector *
    * cases the DVI port is actually a virtual KVM port connected to the service
    * processor.
    */
    +out:
    if ((!rdev->is_atom_bios) &&
    (ret == connector_status_disconnected) &&
    rdev->mode_info.bios_hardcoded_edid_size) {
    @@ -983,7 +984,6 @@ radeon_dvi_detect(struct drm_connector *
    ret = connector_status_connected;
    }

    -out:
    /* updated in get modes as well since we need to know if it's analog or digital */
    radeon_connector_update_scratch_regs(connector, ret);
    return ret;



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