diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_connectors.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 79159b5da05b..64565732cb98 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
| @@ -1658,9 +1658,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1658 | drm_object_attach_property(&radeon_connector->base.base, | 1658 | drm_object_attach_property(&radeon_connector->base.base, |
| 1659 | rdev->mode_info.underscan_vborder_property, | 1659 | rdev->mode_info.underscan_vborder_property, |
| 1660 | 0); | 1660 | 0); |
| 1661 | drm_object_attach_property(&radeon_connector->base.base, | 1661 | if (radeon_audio != 0) |
| 1662 | rdev->mode_info.audio_property, | 1662 | drm_object_attach_property(&radeon_connector->base.base, |
| 1663 | RADEON_AUDIO_DISABLE); | 1663 | rdev->mode_info.audio_property, |
| 1664 | (radeon_audio == 1) ? | ||
| 1665 | RADEON_AUDIO_AUTO : | ||
| 1666 | RADEON_AUDIO_DISABLE); | ||
| 1664 | subpixel_order = SubPixelHorizontalRGB; | 1667 | subpixel_order = SubPixelHorizontalRGB; |
| 1665 | connector->interlace_allowed = true; | 1668 | connector->interlace_allowed = true; |
| 1666 | if (connector_type == DRM_MODE_CONNECTOR_HDMIB) | 1669 | if (connector_type == DRM_MODE_CONNECTOR_HDMIB) |
| @@ -1754,10 +1757,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1754 | rdev->mode_info.underscan_vborder_property, | 1757 | rdev->mode_info.underscan_vborder_property, |
| 1755 | 0); | 1758 | 0); |
| 1756 | } | 1759 | } |
| 1757 | if (ASIC_IS_DCE2(rdev)) { | 1760 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1758 | drm_object_attach_property(&radeon_connector->base.base, | 1761 | drm_object_attach_property(&radeon_connector->base.base, |
| 1759 | rdev->mode_info.audio_property, | 1762 | rdev->mode_info.audio_property, |
| 1760 | RADEON_AUDIO_DISABLE); | 1763 | (radeon_audio == 1) ? |
| 1764 | RADEON_AUDIO_AUTO : | ||
| 1765 | RADEON_AUDIO_DISABLE); | ||
| 1761 | } | 1766 | } |
| 1762 | if (connector_type == DRM_MODE_CONNECTOR_DVII) { | 1767 | if (connector_type == DRM_MODE_CONNECTOR_DVII) { |
| 1763 | radeon_connector->dac_load_detect = true; | 1768 | radeon_connector->dac_load_detect = true; |
| @@ -1799,10 +1804,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1799 | rdev->mode_info.underscan_vborder_property, | 1804 | rdev->mode_info.underscan_vborder_property, |
| 1800 | 0); | 1805 | 0); |
| 1801 | } | 1806 | } |
| 1802 | if (ASIC_IS_DCE2(rdev)) { | 1807 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1803 | drm_object_attach_property(&radeon_connector->base.base, | 1808 | drm_object_attach_property(&radeon_connector->base.base, |
| 1804 | rdev->mode_info.audio_property, | 1809 | rdev->mode_info.audio_property, |
| 1805 | RADEON_AUDIO_DISABLE); | 1810 | (radeon_audio == 1) ? |
| 1811 | RADEON_AUDIO_AUTO : | ||
| 1812 | RADEON_AUDIO_DISABLE); | ||
| 1806 | } | 1813 | } |
| 1807 | subpixel_order = SubPixelHorizontalRGB; | 1814 | subpixel_order = SubPixelHorizontalRGB; |
| 1808 | connector->interlace_allowed = true; | 1815 | connector->interlace_allowed = true; |
| @@ -1843,10 +1850,12 @@ radeon_add_atom_connector(struct drm_device *dev, | |||
| 1843 | rdev->mode_info.underscan_vborder_property, | 1850 | rdev->mode_info.underscan_vborder_property, |
| 1844 | 0); | 1851 | 0); |
| 1845 | } | 1852 | } |
| 1846 | if (ASIC_IS_DCE2(rdev)) { | 1853 | if (ASIC_IS_DCE2(rdev) && (radeon_audio != 0)) { |
| 1847 | drm_object_attach_property(&radeon_connector->base.base, | 1854 | drm_object_attach_property(&radeon_connector->base.base, |
| 1848 | rdev->mode_info.audio_property, | 1855 | rdev->mode_info.audio_property, |
| 1849 | RADEON_AUDIO_DISABLE); | 1856 | (radeon_audio == 1) ? |
| 1857 | RADEON_AUDIO_AUTO : | ||
| 1858 | RADEON_AUDIO_DISABLE); | ||
| 1850 | } | 1859 | } |
| 1851 | connector->interlace_allowed = true; | 1860 | connector->interlace_allowed = true; |
| 1852 | /* in theory with a DP to VGA converter... */ | 1861 | /* in theory with a DP to VGA converter... */ |