diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2015-05-27 11:43:53 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-05-27 12:08:29 -0400 |
| commit | 2d1c18bba15daf89d75ce475ecd2068f483aa12f (patch) | |
| tree | 469ed8e4de8ad30075dd0f24d2a1a7bbe5ba90b3 /drivers/gpu/drm/radeon/radeon_connectors.c | |
| parent | a10f0df0615abb194968fc08147f3cdd70fd5aa5 (diff) | |
| download | op-kernel-dev-2d1c18bba15daf89d75ce475ecd2068f483aa12f.zip op-kernel-dev-2d1c18bba15daf89d75ce475ecd2068f483aa12f.tar.gz | |
Revert "drm/radeon: only mark audio as connected if the monitor supports it (v3)"
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.
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_connectors.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index d17d251..cebb65e 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1379,10 +1379,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); @@ -1719,10 +1717,8 @@ radeon_dp_detect(struct drm_connector *connector, bool force) 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); |
