| From 7403c515c49c033fec33df0814fffdc977e6acdc Mon Sep 17 00:00:00 2001 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Wed, 13 Apr 2016 12:08:27 -0400 |
| Subject: drm/radeon: fix initial connector audio value |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| commit 7403c515c49c033fec33df0814fffdc977e6acdc upstream. |
| |
| This got lost somewhere along the way. This fixes |
| audio not working until set_property was called. |
| |
| Noticed-by: Hyungwon Hwang <hyungwon.hwang7@gmail.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/radeon/radeon_connectors.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/radeon/radeon_connectors.c |
| +++ b/drivers/gpu/drm/radeon/radeon_connectors.c |
| @@ -1996,10 +1996,12 @@ radeon_add_atom_connector(struct drm_dev |
| rdev->mode_info.dither_property, |
| RADEON_FMT_DITHER_DISABLE); |
| |
| - if (radeon_audio != 0) |
| + if (radeon_audio != 0) { |
| drm_object_attach_property(&radeon_connector->base.base, |
| rdev->mode_info.audio_property, |
| RADEON_AUDIO_AUTO); |
| + radeon_connector->audio = RADEON_AUDIO_AUTO; |
| + } |
| if (ASIC_IS_DCE5(rdev)) |
| drm_object_attach_property(&radeon_connector->base.base, |
| rdev->mode_info.output_csc_property, |
| @@ -2124,6 +2126,7 @@ radeon_add_atom_connector(struct drm_dev |
| drm_object_attach_property(&radeon_connector->base.base, |
| rdev->mode_info.audio_property, |
| RADEON_AUDIO_AUTO); |
| + radeon_connector->audio = RADEON_AUDIO_AUTO; |
| } |
| if (connector_type == DRM_MODE_CONNECTOR_DVII) { |
| radeon_connector->dac_load_detect = true; |
| @@ -2179,6 +2182,7 @@ radeon_add_atom_connector(struct drm_dev |
| drm_object_attach_property(&radeon_connector->base.base, |
| rdev->mode_info.audio_property, |
| RADEON_AUDIO_AUTO); |
| + radeon_connector->audio = RADEON_AUDIO_AUTO; |
| } |
| if (ASIC_IS_DCE5(rdev)) |
| drm_object_attach_property(&radeon_connector->base.base, |
| @@ -2231,6 +2235,7 @@ radeon_add_atom_connector(struct drm_dev |
| drm_object_attach_property(&radeon_connector->base.base, |
| rdev->mode_info.audio_property, |
| RADEON_AUDIO_AUTO); |
| + radeon_connector->audio = RADEON_AUDIO_AUTO; |
| } |
| if (ASIC_IS_DCE5(rdev)) |
| drm_object_attach_property(&radeon_connector->base.base, |
