Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7403c515 authored by Alex Deucher's avatar Alex Deucher
Browse files

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: default avatarHyungwon Hwang <hyungwon.hwang7@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ff3e84e8

drivers/gpu/drm/radeon/radeon_connectors.c

+6 −1
Original line number Diff line number Diff line
@@ -2002,10 +2002,12 @@ radeon_add_atom_connector(struct drm_device *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,
@@ -2130,6 +2132,7 @@ radeon_add_atom_connector(struct drm_device *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;
@@ -2185,6 +2188,7 @@ radeon_add_atom_connector(struct drm_device *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,
@@ -2237,6 +2241,7 @@ radeon_add_atom_connector(struct drm_device *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,