aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-10-11 21:44:52 -0400
committerRob Clark <robdclark@gmail.com>2012-11-30 11:20:11 -0500
commite35755fa343995d85b1069513300bd7bd4eca117 (patch)
tree10193ad77e63b42ee6a721103e782356f8811074
parenta69ac9ea85d87b57166a1c017c5019447b854a68 (diff)
drm/radeon: drm_connector_property -> drm_object_property
Signed-off-by: Rob Clark <rob@ti.com>
Diffstat
-rw-r--r--drivers/gpu/drm/radeon/radeon_connectors.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index b884c362a8c2..47bf162ab9c6 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1599,7 +1599,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1599 connector->interlace_allowed = true; 1599 connector->interlace_allowed = true;
1600 connector->doublescan_allowed = true; 1600 connector->doublescan_allowed = true;
1601 radeon_connector->dac_load_detect = true; 1601 radeon_connector->dac_load_detect = true;
1602 drm_connector_attach_property(&radeon_connector->base, 1602 drm_object_attach_property(&radeon_connector->base.base,
1603 rdev->mode_info.load_detect_property, 1603 rdev->mode_info.load_detect_property,
1604 1); 1604 1);
1605 break; 1605 break;
@@ -1608,13 +1608,13 @@ radeon_add_atom_connector(struct drm_device *dev,
1608 case DRM_MODE_CONNECTOR_HDMIA: 1608 case DRM_MODE_CONNECTOR_HDMIA:
1609 case DRM_MODE_CONNECTOR_HDMIB: 1609 case DRM_MODE_CONNECTOR_HDMIB:
1610 case DRM_MODE_CONNECTOR_DisplayPort: 1610 case DRM_MODE_CONNECTOR_DisplayPort:
1611 drm_connector_attach_property(&radeon_connector->base, 1611 drm_object_attach_property(&radeon_connector->base.base,
1612 rdev->mode_info.underscan_property, 1612 rdev->mode_info.underscan_property,
1613 UNDERSCAN_OFF); 1613 UNDERSCAN_OFF);
1614 drm_connector_attach_property(&radeon_connector->base, 1614 drm_object_attach_property(&radeon_connector->base.base,
1615 rdev->mode_info.underscan_hborder_property, 1615 rdev->mode_info.underscan_hborder_property,
1616 0); 1616 0);
1617 drm_connector_attach_property(&radeon_connector->base, 1617 drm_object_attach_property(&radeon_connector->base.base,
1618 rdev->mode_info.underscan_vborder_property, 1618 rdev->mode_info.underscan_vborder_property,
1619 0); 1619 0);
1620 subpixel_order = SubPixelHorizontalRGB; 1620 subpixel_order = SubPixelHorizontalRGB;
@@ -1625,14 +1625,14 @@ radeon_add_atom_connector(struct drm_device *dev,
1625 connector->doublescan_allowed = false; 1625 connector->doublescan_allowed = false;
1626 if (connector_type == DRM_MODE_CONNECTOR_DVII) { 1626 if (connector_type == DRM_MODE_CONNECTOR_DVII) {
1627 radeon_connector->dac_load_detect = true; 1627 radeon_connector->dac_load_detect = true;
1628 drm_connector_attach_property(&radeon_connector->base, 1628 drm_object_attach_property(&radeon_connector->base.base,
1629 rdev->mode_info.load_detect_property, 1629 rdev->mode_info.load_detect_property,
1630 1); 1630 1);
1631 } 1631 }
1632 break; 1632 break;
1633 case DRM_MODE_CONNECTOR_LVDS: 1633 case DRM_MODE_CONNECTOR_LVDS:
1634 case DRM_MODE_CONNECTOR_eDP: 1634 case DRM_MODE_CONNECTOR_eDP:
1635 drm_connector_attach_property(&radeon_connector->base, 1635 drm_object_attach_property(&radeon_connector->base.base,
1636 dev->mode_config.scaling_mode_property, 1636 dev->mode_config.scaling_mode_property,
1637 DRM_MODE_SCALE_FULLSCREEN); 1637 DRM_MODE_SCALE_FULLSCREEN);
1638 subpixel_order = SubPixelHorizontalRGB; 1638 subpixel_order = SubPixelHorizontalRGB;
@@ -1651,7 +1651,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1651 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1651 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1652 } 1652 }
1653 radeon_connector->dac_load_detect = true; 1653 radeon_connector->dac_load_detect = true;
1654 drm_connector_attach_property(&radeon_connector->base, 1654 drm_object_attach_property(&radeon_connector->base.base,
1655 rdev->mode_info.load_detect_property, 1655 rdev->mode_info.load_detect_property,
1656 1); 1656 1);
1657 /* no HPD on analog connectors */ 1657 /* no HPD on analog connectors */
@@ -1669,7 +1669,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1669 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1669 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1670 } 1670 }
1671 radeon_connector->dac_load_detect = true; 1671 radeon_connector->dac_load_detect = true;
1672 drm_connector_attach_property(&radeon_connector->base, 1672 drm_object_attach_property(&radeon_connector->base.base,
1673 rdev->mode_info.load_detect_property, 1673 rdev->mode_info.load_detect_property,
1674 1); 1674 1);
1675 /* no HPD on analog connectors */ 1675 /* no HPD on analog connectors */
@@ -1692,23 +1692,23 @@ radeon_add_atom_connector(struct drm_device *dev,
1692 DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1692 DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1693 } 1693 }
1694 subpixel_order = SubPixelHorizontalRGB; 1694 subpixel_order = SubPixelHorizontalRGB;
1695 drm_connector_attach_property(&radeon_connector->base, 1695 drm_object_attach_property(&radeon_connector->base.base,
1696 rdev->mode_info.coherent_mode_property, 1696 rdev->mode_info.coherent_mode_property,
1697 1); 1697 1);
1698 if (ASIC_IS_AVIVO(rdev)) { 1698 if (ASIC_IS_AVIVO(rdev)) {
1699 drm_connector_attach_property(&radeon_connector->base, 1699 drm_object_attach_property(&radeon_connector->base.base,
1700 rdev->mode_info.underscan_property, 1700 rdev->mode_info.underscan_property,
1701 UNDERSCAN_OFF); 1701 UNDERSCAN_OFF);
1702 drm_connector_attach_property(&radeon_connector->base, 1702 drm_object_attach_property(&radeon_connector->base.base,
1703 rdev->mode_info.underscan_hborder_property, 1703 rdev->mode_info.underscan_hborder_property,
1704 0); 1704 0);
1705 drm_connector_attach_property(&radeon_connector->base, 1705 drm_object_attach_property(&radeon_connector->base.base,
1706 rdev->mode_info.underscan_vborder_property, 1706 rdev->mode_info.underscan_vborder_property,
1707 0); 1707 0);
1708 } 1708 }
1709 if (connector_type == DRM_MODE_CONNECTOR_DVII) { 1709 if (connector_type == DRM_MODE_CONNECTOR_DVII) {
1710 radeon_connector->dac_load_detect = true; 1710 radeon_connector->dac_load_detect = true;
1711 drm_connector_attach_property(&radeon_connector->base, 1711 drm_object_attach_property(&radeon_connector->base.base,
1712 rdev->mode_info.load_detect_property, 1712 rdev->mode_info.load_detect_property,
1713 1); 1713 1);
1714 } 1714 }
@@ -1732,17 +1732,17 @@ radeon_add_atom_connector(struct drm_device *dev,
1732 if (!radeon_connector->ddc_bus) 1732 if (!radeon_connector->ddc_bus)
1733 DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1733 DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1734 } 1734 }
1735 drm_connector_attach_property(&radeon_connector->base, 1735 drm_object_attach_property(&radeon_connector->base.base,
1736 rdev->mode_info.coherent_mode_property, 1736 rdev->mode_info.coherent_mode_property,
1737 1); 1737 1);
1738 if (ASIC_IS_AVIVO(rdev)) { 1738 if (ASIC_IS_AVIVO(rdev)) {
1739 drm_connector_attach_property(&radeon_connector->base, 1739 drm_object_attach_property(&radeon_connector->base.base,
1740 rdev->mode_info.underscan_property, 1740 rdev->mode_info.underscan_property,
1741 UNDERSCAN_OFF); 1741 UNDERSCAN_OFF);
1742 drm_connector_attach_property(&radeon_connector->base, 1742 drm_object_attach_property(&radeon_connector->base.base,
1743 rdev->mode_info.underscan_hborder_property, 1743 rdev->mode_info.underscan_hborder_property,
1744 0); 1744 0);
1745 drm_connector_attach_property(&radeon_connector->base, 1745 drm_object_attach_property(&radeon_connector->base.base,
1746 rdev->mode_info.underscan_vborder_property, 1746 rdev->mode_info.underscan_vborder_property,
1747 0); 1747 0);
1748 } 1748 }
@@ -1771,17 +1771,17 @@ radeon_add_atom_connector(struct drm_device *dev,
1771 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1771 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1772 } 1772 }
1773 subpixel_order = SubPixelHorizontalRGB; 1773 subpixel_order = SubPixelHorizontalRGB;
1774 drm_connector_attach_property(&radeon_connector->base, 1774 drm_object_attach_property(&radeon_connector->base.base,
1775 rdev->mode_info.coherent_mode_property, 1775 rdev->mode_info.coherent_mode_property,
1776 1); 1776 1);
1777 if (ASIC_IS_AVIVO(rdev)) { 1777 if (ASIC_IS_AVIVO(rdev)) {
1778 drm_connector_attach_property(&radeon_connector->base, 1778 drm_object_attach_property(&radeon_connector->base.base,
1779 rdev->mode_info.underscan_property, 1779 rdev->mode_info.underscan_property,
1780 UNDERSCAN_OFF); 1780 UNDERSCAN_OFF);
1781 drm_connector_attach_property(&radeon_connector->base, 1781 drm_object_attach_property(&radeon_connector->base.base,
1782 rdev->mode_info.underscan_hborder_property, 1782 rdev->mode_info.underscan_hborder_property,
1783 0); 1783 0);
1784 drm_connector_attach_property(&radeon_connector->base, 1784 drm_object_attach_property(&radeon_connector->base.base,
1785 rdev->mode_info.underscan_vborder_property, 1785 rdev->mode_info.underscan_vborder_property,
1786 0); 1786 0);
1787 } 1787 }
@@ -1806,7 +1806,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1806 if (!radeon_connector->ddc_bus) 1806 if (!radeon_connector->ddc_bus)
1807 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1807 DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1808 } 1808 }
1809 drm_connector_attach_property(&radeon_connector->base, 1809 drm_object_attach_property(&radeon_connector->base.base,
1810 dev->mode_config.scaling_mode_property, 1810 dev->mode_config.scaling_mode_property,
1811 DRM_MODE_SCALE_FULLSCREEN); 1811 DRM_MODE_SCALE_FULLSCREEN);
1812 subpixel_order = SubPixelHorizontalRGB; 1812 subpixel_order = SubPixelHorizontalRGB;
@@ -1819,10 +1819,10 @@ radeon_add_atom_connector(struct drm_device *dev,
1819 drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type); 1819 drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
1820 drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs); 1820 drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
1821 radeon_connector->dac_load_detect = true; 1821 radeon_connector->dac_load_detect = true;
1822 drm_connector_attach_property(&radeon_connector->base, 1822 drm_object_attach_property(&radeon_connector->base.base,
1823 rdev->mode_info.load_detect_property, 1823 rdev->mode_info.load_detect_property,
1824 1); 1824 1);
1825 drm_connector_attach_property(&radeon_connector->base, 1825 drm_object_attach_property(&radeon_connector->base.base,
1826 rdev->mode_info.tv_std_property, 1826 rdev->mode_info.tv_std_property,
1827 radeon_atombios_get_tv_info(rdev)); 1827 radeon_atombios_get_tv_info(rdev));
1828 /* no HPD on analog connectors */ 1828 /* no HPD on analog connectors */
@@ -1843,7 +1843,7 @@ radeon_add_atom_connector(struct drm_device *dev,
1843 if (!radeon_connector->ddc_bus) 1843 if (!radeon_connector->ddc_bus)
1844 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1844 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1845 } 1845 }
1846 drm_connector_attach_property(&radeon_connector->base, 1846 drm_object_attach_property(&radeon_connector->base.base,
1847 dev->mode_config.scaling_mode_property, 1847 dev->mode_config.scaling_mode_property,
1848 DRM_MODE_SCALE_FULLSCREEN); 1848 DRM_MODE_SCALE_FULLSCREEN);
1849 subpixel_order = SubPixelHorizontalRGB; 1849 subpixel_order = SubPixelHorizontalRGB;
@@ -1922,7 +1922,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
1922 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1922 DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1923 } 1923 }
1924 radeon_connector->dac_load_detect = true; 1924 radeon_connector->dac_load_detect = true;
1925 drm_connector_attach_property(&radeon_connector->base, 1925 drm_object_attach_property(&radeon_connector->base.base,
1926 rdev->mode_info.load_detect_property, 1926 rdev->mode_info.load_detect_property,
1927 1); 1927 1);
1928 /* no HPD on analog connectors */ 1928 /* no HPD on analog connectors */
@@ -1940,7 +1940,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
1940 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 1940 DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
1941 } 1941 }
1942 radeon_connector->dac_load_detect = true; 1942 radeon_connector->dac_load_detect = true;
1943 drm_connector_attach_property(&radeon_connector->base, 1943 drm_object_attach_property(&radeon_connector->base.base,
1944 rdev->mode_info.load_detect_property, 1944 rdev->mode_info.load_detect_property,
1945 1); 1945 1);
1946 /* no HPD on analog connectors */ 1946 /* no HPD on analog connectors */
@@ -1959,7 +1959,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
1959 } 1959 }
1960 if (connector_type == DRM_MODE_CONNECTOR_DVII) { 1960 if (connector_type == DRM_MODE_CONNECTOR_DVII) {
1961 radeon_connector->dac_load_detect = true; 1961 radeon_connector->dac_load_detect = true;
1962 drm_connector_attach_property(&radeon_connector->base, 1962 drm_object_attach_property(&radeon_connector->base.base,
1963 rdev->mode_info.load_detect_property, 1963 rdev->mode_info.load_detect_property,
1964 1); 1964 1);
1965 } 1965 }
@@ -1983,10 +1983,10 @@ radeon_add_legacy_connector(struct drm_device *dev,
1983 */ 1983 */
1984 if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) 1984 if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480)
1985 radeon_connector->dac_load_detect = false; 1985 radeon_connector->dac_load_detect = false;
1986 drm_connector_attach_property(&radeon_connector->base, 1986 drm_object_attach_property(&radeon_connector->base.base,
1987 rdev->mode_info.load_detect_property, 1987 rdev->mode_info.load_detect_property,
1988 radeon_connector->dac_load_detect); 1988 radeon_connector->dac_load_detect);
1989 drm_connector_attach_property(&radeon_connector->base, 1989 drm_object_attach_property(&radeon_connector->base.base,
1990 rdev->mode_info.tv_std_property, 1990 rdev->mode_info.tv_std_property,
1991 radeon_combios_get_tv_info(rdev)); 1991 radeon_combios_get_tv_info(rdev));
1992 /* no HPD on analog connectors */ 1992 /* no HPD on analog connectors */
@@ -2002,7 +2002,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
2002 if (!radeon_connector->ddc_bus) 2002 if (!radeon_connector->ddc_bus)
2003 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); 2003 DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
2004 } 2004 }
2005 drm_connector_attach_property(&radeon_connector->base, 2005 drm_object_attach_property(&radeon_connector->base.base,
2006 dev->mode_config.scaling_mode_property, 2006 dev->mode_config.scaling_mode_property,
2007 DRM_MODE_SCALE_FULLSCREEN); 2007 DRM_MODE_SCALE_FULLSCREEN);
2008 subpixel_order = SubPixelHorizontalRGB; 2008 subpixel_order = SubPixelHorizontalRGB;
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-22 13:56:46 -0400