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: hongao <hongao@uniontech.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
69130888b2
commit
1c7d957c5d
@@ -1671,10 +1671,12 @@ amdgpu_connector_add(struct amdgpu_device *adev,
|
|||||||
adev->mode_info.dither_property,
|
adev->mode_info.dither_property,
|
||||||
AMDGPU_FMT_DITHER_DISABLE);
|
AMDGPU_FMT_DITHER_DISABLE);
|
||||||
|
|
||||||
if (amdgpu_audio != 0)
|
if (amdgpu_audio != 0) {
|
||||||
drm_object_attach_property(&amdgpu_connector->base.base,
|
drm_object_attach_property(&amdgpu_connector->base.base,
|
||||||
adev->mode_info.audio_property,
|
adev->mode_info.audio_property,
|
||||||
AMDGPU_AUDIO_AUTO);
|
AMDGPU_AUDIO_AUTO);
|
||||||
|
amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
|
||||||
|
}
|
||||||
|
|
||||||
subpixel_order = SubPixelHorizontalRGB;
|
subpixel_order = SubPixelHorizontalRGB;
|
||||||
connector->interlace_allowed = true;
|
connector->interlace_allowed = true;
|
||||||
@@ -1796,6 +1798,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
|
|||||||
drm_object_attach_property(&amdgpu_connector->base.base,
|
drm_object_attach_property(&amdgpu_connector->base.base,
|
||||||
adev->mode_info.audio_property,
|
adev->mode_info.audio_property,
|
||||||
AMDGPU_AUDIO_AUTO);
|
AMDGPU_AUDIO_AUTO);
|
||||||
|
amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
|
||||||
}
|
}
|
||||||
drm_object_attach_property(&amdgpu_connector->base.base,
|
drm_object_attach_property(&amdgpu_connector->base.base,
|
||||||
adev->mode_info.dither_property,
|
adev->mode_info.dither_property,
|
||||||
@@ -1849,6 +1852,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
|
|||||||
drm_object_attach_property(&amdgpu_connector->base.base,
|
drm_object_attach_property(&amdgpu_connector->base.base,
|
||||||
adev->mode_info.audio_property,
|
adev->mode_info.audio_property,
|
||||||
AMDGPU_AUDIO_AUTO);
|
AMDGPU_AUDIO_AUTO);
|
||||||
|
amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
|
||||||
}
|
}
|
||||||
drm_object_attach_property(&amdgpu_connector->base.base,
|
drm_object_attach_property(&amdgpu_connector->base.base,
|
||||||
adev->mode_info.dither_property,
|
adev->mode_info.dither_property,
|
||||||
@@ -1899,6 +1903,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
|
|||||||
drm_object_attach_property(&amdgpu_connector->base.base,
|
drm_object_attach_property(&amdgpu_connector->base.base,
|
||||||
adev->mode_info.audio_property,
|
adev->mode_info.audio_property,
|
||||||
AMDGPU_AUDIO_AUTO);
|
AMDGPU_AUDIO_AUTO);
|
||||||
|
amdgpu_connector->audio = AMDGPU_AUDIO_AUTO;
|
||||||
}
|
}
|
||||||
drm_object_attach_property(&amdgpu_connector->base.base,
|
drm_object_attach_property(&amdgpu_connector->base.base,
|
||||||
adev->mode_info.dither_property,
|
adev->mode_info.dither_property,
|
||||||
|
Reference in New Issue
Block a user