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

Commit e67c2cda authored by hongao's avatar hongao Committed by Greg Kroah-Hartman
Browse files

drm/amdgpu: fix initial connector audio value 



[ Upstream commit 4bb71fce58f30df3f251118291d6b0187ce531e6 ]

This got lost somewhere along the way, This fixes
audio not working until set_property was called.

Signed-off-by: default avatarhongao <hongao@uniontech.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 079f64a1

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+6 −1
Original line number Diff line number Diff line
@@ -1646,10 +1646,12 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
						   adev->mode_info.dither_property,

						   AMDGPU_FMT_DITHER_DISABLE);



			if (amdgpu_audio != 0)

			if (amdgpu_audio != 0) {

				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}



			subpixel_order = SubPixelHorizontalRGB;

			connector->interlace_allowed = true;
@@ -1771,6 +1773,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}

			drm_object_attach_property(&amdgpu_connector->base.base,

						   adev->mode_info.dither_property,
@@ -1824,6 +1827,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}

			drm_object_attach_property(&amdgpu_connector->base.base,

						   adev->mode_info.dither_property,
@@ -1874,6 +1878,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
				drm_object_attach_property(&amdgpu_connector->base.base,

							   adev->mode_info.audio_property,

							   AMDGPU_AUDIO_AUTO);

				amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;

			}

			drm_object_attach_property(&amdgpu_connector->base.base,

						   adev->mode_info.dither_property,