diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-04-13 12:08:27 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-04-14 00:26:29 -0400 |
| commit | 7403c515c49c033fec33df0814fffdc977e6acdc (patch) | |
| tree | 7cd0339c50e66e16d1f4cf35e6adc611a838867b /drivers/gpu/drm | |
| parent | ff3e84e8e479c3ba7148f8dc35a56cf091ab56d9 (diff) | |
drm/radeon: fix initial connector audio value
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>
Cc: stable@vger.kernel.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index cfcc099c537d..81a63d7f5cd9 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
| @@ -2002,10 +2002,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 2002 | rdev->mode_info.dither_property, | 2002 | rdev->mode_info.dither_property, |
| 2003 | RADEON_FMT_DITHER_DISABLE); | 2003 | RADEON_FMT_DITHER_DISABLE); |
| 2004 | 2004 | ||
| 2005 | if (radeon_audio != 0) | 2005 | if (radeon_audio != 0) { |
| 2006 | drm_object_attach_property(&radeon_connector->base.base, | 2006 | drm_object_attach_property(&radeon_connector->base.base, |
| 2007 | rdev->mode_info.audio_property, | 2007 | rdev->mode_info.audio_property, |
| 2008 | RADEON_AUDIO_AUTO); | 2008 | RADEON_AUDIO_AUTO); |
| 2009 | radeon_connector->audio = RADEON_AUDIO_AUTO; | ||
| 2010 | } | ||
| 2009 | if (ASIC_IS_DCE5(rdev)) | 2011 | if (ASIC_IS_DCE5(rdev)) |
| 2010 | drm_object_attach_property(&radeon_connector->base.base, | 2012 | drm_object_attach_property(&radeon_connector->base.base, |
| 2011 | rdev->mode_info.output_csc_property, | 2013 | rdev->mode_info.output_csc_property, |
| @@ -2130,6 +2132,7 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 2130 | drm_object_attach_property(&radeon_connector->base.base, | 2132 | drm_object_attach_property(&radeon_connector->base.base, |
| 2131 | rdev->mode_info.audio_property, | 2133 | rdev->mode_info.audio_property, |
| 2132 | RADEON_AUDIO_AUTO); | 2134 | RADEON_AUDIO_AUTO); |
| 2135 | radeon_connector->audio = RADEON_AUDIO_AUTO; | ||
| 2133 | } | 2136 | } |
| 2134 | if (connector_type == DRM_MODE_CONNECTOR_DVII) { | 2137 | if (connector_type == DRM_MODE_CONNECTOR_DVII) { |
| 2135 | radeon_connector->dac_load_detect = true; | 2138 | radeon_connector->dac_load_detect = true; |
| @@ -2185,6 +2188,7 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 2185 | drm_object_attach_property(&radeon_connector->base.base, | 2188 | drm_object_attach_property(&radeon_connector->base.base, |
| 2186 | rdev->mode_info.audio_property, | 2189 | rdev->mode_info.audio_property, |
| 2187 | RADEON_AUDIO_AUTO); | 2190 | RADEON_AUDIO_AUTO); |
| 2191 | radeon_connector->audio = RADEON_AUDIO_AUTO; | ||
| 2188 | } | 2192 | } |
| 2189 | if (ASIC_IS_DCE5(rdev)) | 2193 | if (ASIC_IS_DCE5(rdev)) |
| 2190 | drm_object_attach_property(&radeon_connector->base.base, | 2194 | drm_object_attach_property(&radeon_connector->base.base, |
| @@ -2237,6 +2241,7 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 2237 | drm_object_attach_property(&radeon_connector->base.base, | 2241 | drm_object_attach_property(&radeon_connector->base.base, |
| 2238 | rdev->mode_info.audio_property, | 2242 | rdev->mode_info.audio_property, |
| 2239 | RADEON_AUDIO_AUTO); | 2243 | RADEON_AUDIO_AUTO); |
| 2244 | radeon_connector->audio = RADEON_AUDIO_AUTO; | ||
| 2240 | } | 2245 | } |
| 2241 | if (ASIC_IS_DCE5(rdev)) | 2246 | if (ASIC_IS_DCE5(rdev)) |
| 2242 | drm_object_attach_property(&radeon_connector->base.base, | 2247 | drm_object_attach_property(&radeon_connector->base.base, |