lkml.org 
[lkml]   [2015]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.0 137/148] Revert "drm/radeon: only mark audio as connected if the monitor supports it (v3)"
    Date
    4.0-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 2d1c18bba15daf89d75ce475ecd2068f483aa12f upstream.

    This breaks too many things.

    bugs:
    https://bugzilla.kernel.org/show_bug.cgi?id=99041
    https://bugs.freedesktop.org/show_bug.cgi?id=90681

    This reverts commit 0f55db36d49d45b80eff0c0a2a498766016f458b.

    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/radeon_audio.c | 27 ++++++++++++---------------
    drivers/gpu/drm/radeon/radeon_connectors.c | 8 ++------
    2 files changed, 14 insertions(+), 21 deletions(-)

    --- a/drivers/gpu/drm/radeon/radeon_audio.c
    +++ b/drivers/gpu/drm/radeon/radeon_audio.c
    @@ -460,9 +460,6 @@ void radeon_audio_detect(struct drm_conn
    if (!connector || !connector->encoder)
    return;

    - if (!radeon_encoder_is_digital(connector->encoder))
    - return;
    -
    rdev = connector->encoder->dev->dev_private;

    if (!radeon_audio_chipset_supported(rdev))
    @@ -471,26 +468,26 @@ void radeon_audio_detect(struct drm_conn
    radeon_encoder = to_radeon_encoder(connector->encoder);
    dig = radeon_encoder->enc_priv;

    - if (!dig->afmt)
    - return;
    -
    if (status == connector_status_connected) {
    - struct radeon_connector *radeon_connector = to_radeon_connector(connector);
    + struct radeon_connector *radeon_connector;
    + int sink_type;
    +
    + if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) {
    + radeon_encoder->audio = NULL;
    + return;
    + }
    +
    + radeon_connector = to_radeon_connector(connector);
    + sink_type = radeon_dp_getsinktype(radeon_connector);

    if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
    - radeon_dp_getsinktype(radeon_connector) ==
    - CONNECTOR_OBJECT_ID_DISPLAYPORT)
    + sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT)
    radeon_encoder->audio = rdev->audio.dp_funcs;
    else
    radeon_encoder->audio = rdev->audio.hdmi_funcs;

    dig->afmt->pin = radeon_audio_get_pin(connector->encoder);
    - if (drm_detect_monitor_audio(radeon_connector_edid(connector))) {
    - radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
    - } else {
    - radeon_audio_enable(rdev, dig->afmt->pin, 0);
    - dig->afmt->pin = NULL;
    - }
    + radeon_audio_enable(rdev, dig->afmt->pin, 0xf);
    } else {
    radeon_audio_enable(rdev, dig->afmt->pin, 0);
    dig->afmt->pin = NULL;
    --- a/drivers/gpu/drm/radeon/radeon_connectors.c
    +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
    @@ -1333,10 +1333,8 @@ 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);

    - if (radeon_audio != 0) {
    - radeon_connector_get_edid(connector);
    + if (radeon_audio != 0)
    radeon_audio_detect(connector, ret);
    - }

    exit:
    pm_runtime_mark_last_busy(connector->dev->dev);
    @@ -1661,10 +1659,8 @@ radeon_dp_detect(struct drm_connector *c

    radeon_connector_update_scratch_regs(connector, ret);

    - if (radeon_audio != 0) {
    - radeon_connector_get_edid(connector);
    + if (radeon_audio != 0)
    radeon_audio_detect(connector, ret);
    - }

    out:
    pm_runtime_mark_last_busy(connector->dev->dev);



    \
     
     \ /
      Last update: 2015-06-03 14:41    [W:2.318 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site