diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-11 10:23:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-11 10:23:11 +0800 |
| commit | bfbd381ea0ca274e4c07ea62acaaeac31829cd5d (patch) | |
| tree | 0531122e023ecbf1ecf9416fc1111955b10ea68b /drivers/gpu/drm/radeon/atombios_encoders.c | |
| parent | 906d9eadd3b6698fa6ceb9bcdf41da6aa56d0a24 (diff) | |
| parent | 115d588693b6f8f9cfad409c091225d4095159e3 (diff) | |
Merge tag 'v4.1.20-rt23' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt into linux-linaro-lsk-v4.1-rt
Linux 4.1.20-rt23
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_encoders.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_encoders.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 5be50ef2b30e..bb292143997e 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c @@ -2310,8 +2310,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, encoder_mode = atombios_get_encoder_mode(encoder); if (connector && (radeon_audio != 0) && ((encoder_mode == ATOM_ENCODER_MODE_HDMI) || - (ENCODER_MODE_IS_DP(encoder_mode) && - drm_detect_monitor_audio(radeon_connector_edid(connector))))) + ENCODER_MODE_IS_DP(encoder_mode))) radeon_audio_mode_set(encoder, adjusted_mode); } |