drm/amdgpu: fix initial connector audio value

[ Upstream commit f9b97415ad797ace9ea8e61767b852e95dc660a8 ]

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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 0e1cacf731698e4d16f8c75fc0daee9b59896630..cf80da354ba1778fafa98aaae24091a8f99c4ed2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -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,