| From 689cb9fe0edd1a86005d559694e2f564f67895dc Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Sep 2022 17:24:53 +0800 |
| Subject: drm/amdgpu: fix initial connector audio value |
| |
| From: hongao <hongao@uniontech.com> |
| |
| [ Upstream commit 4bb71fce58f30df3f251118291d6b0187ce531e6 ] |
| |
| This got lost somewhere along the way, This fixes |
| audio not working until set_property was called. |
| |
| Signed-off-by: hongao <hongao@uniontech.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c |
| index df1f9b88a53f..98d3661336a4 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c |
| @@ -1671,10 +1671,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; |
| @@ -1796,6 +1798,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, |
| @@ -1849,6 +1852,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, |
| @@ -1899,6 +1903,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, |
| -- |
| 2.35.1 |
| |
