diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-11-08 13:03:47 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-11-08 13:03:47 -0500 |
| commit | e31fadd372e9e0d00f25b000c41fa63531ca488e (patch) | |
| tree | e22ef0a1829d60977d25152c79069034f5681744 | |
| parent | 96212fe8c27b39cc713cd8eb8d8e7a55ce3405d5 (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index f60b310b1399..20a768ac89a8 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
| @@ -1728,9 +1728,7 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1728 | if (radeon_audio != 0) | 1728 | if (radeon_audio != 0) |
| 1729 | drm_object_attach_property(&radeon_connector->base.base, | 1729 | drm_object_attach_property(&radeon_connector->base.base, |
| 1730 | rdev->mode_info.audio_property, | 1730 | rdev->mode_info.audio_property, |
| 1731 | (radeon_audio == 1) ? | 1731 | RADEON_AUDIO_AUTO); |
| 1732 | RADEON_AUDIO_AUTO : | ||
| 1733 | RADEON_AUDIO_DISABLE); | ||
| 1734 | 1732 | ||
| 1735 | subpixel_order = SubPixelHorizontalRGB; | 1733 | subpixel_order = SubPixelHorizontalRGB; |
| 1736 | connector->interlace_allowed = true; | 1734 | connector->interlace_allowed = true; |
| @@ -1828,9 +1826,7 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1828 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { | 1826 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1829 | drm_object_attach_property(&radeon_connector->base.base, | 1827 | drm_object_attach_property(&radeon_connector->base.base, |
| 1830 | rdev->mode_info.audio_property, | 1828 | rdev->mode_info.audio_property, |
| 1831 | (radeon_audio == 1) ? | 1829 | RADEON_AUDIO_AUTO); |
| 1832 | RADEON_AUDIO_AUTO : | ||
| 1833 | RADEON_AUDIO_DISABLE); | ||
| 1834 | } | 1830 | } |
| 1835 | if (ASIC_IS_AVIVO(rdev)) { | 1831 | if (ASIC_IS_AVIVO(rdev)) { |
| 1836 | drm_object_attach_property(&radeon_connector->base.base, | 1832 | drm_object_attach_property(&radeon_connector->base.base, |
| @@ -1880,9 +1876,7 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1880 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { | 1876 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1881 | drm_object_attach_property(&radeon_connector->base.base, | 1877 | drm_object_attach_property(&radeon_connector->base.base, |
| 1882 | rdev->mode_info.audio_property, | 1878 | rdev->mode_info.audio_property, |
| 1883 | (radeon_audio == 1) ? | 1879 | RADEON_AUDIO_AUTO); |
| 1884 | RADEON_AUDIO_AUTO : | ||
| 1885 | RADEON_AUDIO_DISABLE); | ||
| 1886 | } | 1880 | } |
| 1887 | if (ASIC_IS_AVIVO(rdev)) { | 1881 | if (ASIC_IS_AVIVO(rdev)) { |
| 1888 | drm_object_attach_property(&radeon_connector->base.base, | 1882 | drm_object_attach_property(&radeon_connector->base.base, |
| @@ -1931,9 +1925,7 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1931 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { | 1925 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1932 | drm_object_attach_property(&radeon_connector->base.base, | 1926 | drm_object_attach_property(&radeon_connector->base.base, |
| 1933 | rdev->mode_info.audio_property, | 1927 | rdev->mode_info.audio_property, |
| 1934 | (radeon_audio == 1) ? | 1928 | RADEON_AUDIO_AUTO); |
| 1935 | RADEON_AUDIO_AUTO : | ||
| 1936 | RADEON_AUDIO_DISABLE); | ||
| 1937 | } | 1929 | } |
| 1938 | if (ASIC_IS_AVIVO(rdev)) { | 1930 | if (ASIC_IS_AVIVO(rdev)) { |
| 1939 | drm_object_attach_property(&radeon_connector->base.base, | 1931 | drm_object_attach_property(&radeon_connector->base.base, |