mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
drm/radeon: fix mismerge of drm-next with 3.12
Audio is enabled by default now. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
96212fe8c2
commit
e31fadd372
1 changed files with 4 additions and 12 deletions
|
@ -1728,9 +1728,7 @@ radeon_add_atom_connector(struct drm_device *dev,
|
|||
if (radeon_audio != 0)
|
||||
drm_object_attach_property(&radeon_connector->base.base,
|
||||
rdev->mode_info.audio_property,
|
||||
(radeon_audio == 1) ?
|
||||
RADEON_AUDIO_AUTO :
|
||||
RADEON_AUDIO_DISABLE);
|
||||
RADEON_AUDIO_AUTO);
|
||||
|
||||
subpixel_order = SubPixelHorizontalRGB;
|
||||
connector->interlace_allowed = true;
|
||||
|
@ -1828,9 +1826,7 @@ radeon_add_atom_connector(struct drm_device *dev,
|
|||
if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
|
||||
drm_object_attach_property(&radeon_connector->base.base,
|
||||
rdev->mode_info.audio_property,
|
||||
(radeon_audio == 1) ?
|
||||
RADEON_AUDIO_AUTO :
|
||||
RADEON_AUDIO_DISABLE);
|
||||
RADEON_AUDIO_AUTO);
|
||||
}
|
||||
if (ASIC_IS_AVIVO(rdev)) {
|
||||
drm_object_attach_property(&radeon_connector->base.base,
|
||||
|
@ -1880,9 +1876,7 @@ radeon_add_atom_connector(struct drm_device *dev,
|
|||
if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
|
||||
drm_object_attach_property(&radeon_connector->base.base,
|
||||
rdev->mode_info.audio_property,
|
||||
(radeon_audio == 1) ?
|
||||
RADEON_AUDIO_AUTO :
|
||||
RADEON_AUDIO_DISABLE);
|
||||
RADEON_AUDIO_AUTO);
|
||||
}
|
||||
if (ASIC_IS_AVIVO(rdev)) {
|
||||
drm_object_attach_property(&radeon_connector->base.base,
|
||||
|
@ -1931,9 +1925,7 @@ radeon_add_atom_connector(struct drm_device *dev,
|
|||
if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) {
|
||||
drm_object_attach_property(&radeon_connector->base.base,
|
||||
rdev->mode_info.audio_property,
|
||||
(radeon_audio == 1) ?
|
||||
RADEON_AUDIO_AUTO :
|
||||
RADEON_AUDIO_DISABLE);
|
||||
RADEON_AUDIO_AUTO);
|
||||
}
|
||||
if (ASIC_IS_AVIVO(rdev)) {
|
||||
drm_object_attach_property(&radeon_connector->base.base,
|
||||
|
|
Loading…
Reference in a new issue