projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a69ac9e)
drm/radeon: drm_connector_property -> drm_object_property
authorRob Clark <rob@ti.com>
Fri, 12 Oct 2012 01:44:52 +0000 (20:44 -0500)
committerRob Clark <robdclark@gmail.com>
Fri, 30 Nov 2012 16:20:11 +0000 (10:20 -0600)
Signed-off-by: Rob Clark <rob@ti.com>
drivers/gpu/drm/radeon/radeon_connectors.c patch | blob | blame | history

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index b884c362a8c2c0770c02ecb09100d1f9440b55ab..47bf162ab9c672825d80a803e14d8aa652a98f04 100644 (file)
--- 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,
                        connector->interlace_allowed = true;
                        connector->doublescan_allowed = true;
                        radeon_connector->dac_load_detect = true;
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.load_detect_property,
                                                      1);
                        break;
@@ -1608,13 +1608,13 @@ radeon_add_atom_connector(struct drm_device *dev,
                case DRM_MODE_CONNECTOR_HDMIA:
                case DRM_MODE_CONNECTOR_HDMIB:
                case DRM_MODE_CONNECTOR_DisplayPort:
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.underscan_property,
                                                      UNDERSCAN_OFF);
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.underscan_hborder_property,
                                                      0);
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.underscan_vborder_property,
                                                      0);
                        subpixel_order = SubPixelHorizontalRGB;
@@ -1625,14 +1625,14 @@ radeon_add_atom_connector(struct drm_device *dev,
                                connector->doublescan_allowed = false;
                        if (connector_type == DRM_MODE_CONNECTOR_DVII) {
                                radeon_connector->dac_load_detect = true;
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.load_detect_property,
                                                              1);
                        }
                        break;
                case DRM_MODE_CONNECTOR_LVDS:
                case DRM_MODE_CONNECTOR_eDP:
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      dev->mode_config.scaling_mode_property,
                                                      DRM_MODE_SCALE_FULLSCREEN);
                        subpixel_order = SubPixelHorizontalRGB;
@@ -1651,7 +1651,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                                        DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                        }
                        radeon_connector->dac_load_detect = true;
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.load_detect_property,
                                                      1);
                        /* no HPD on analog connectors */
@@ -1669,7 +1669,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                                        DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                        }
                        radeon_connector->dac_load_detect = true;
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.load_detect_property,
                                                      1);
                        /* no HPD on analog connectors */
@@ -1692,23 +1692,23 @@ radeon_add_atom_connector(struct drm_device *dev,
                                        DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                        }
                        subpixel_order = SubPixelHorizontalRGB;
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.coherent_mode_property,
                                                      1);
                        if (ASIC_IS_AVIVO(rdev)) {
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_property,
                                                              UNDERSCAN_OFF);
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_hborder_property,
                                                              0);
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_vborder_property,
                                                              0);
                        }
                        if (connector_type == DRM_MODE_CONNECTOR_DVII) {
                                radeon_connector->dac_load_detect = true;
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.load_detect_property,
                                                              1);
                        }
@@ -1732,17 +1732,17 @@ radeon_add_atom_connector(struct drm_device *dev,
                                if (!radeon_connector->ddc_bus)
                                        DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                        }
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.coherent_mode_property,
                                                      1);
                        if (ASIC_IS_AVIVO(rdev)) {
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_property,
                                                              UNDERSCAN_OFF);
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_hborder_property,
                                                              0);
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_vborder_property,
                                                              0);
                        }
@@ -1771,17 +1771,17 @@ radeon_add_atom_connector(struct drm_device *dev,
                                        DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                        }
                        subpixel_order = SubPixelHorizontalRGB;
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.coherent_mode_property,
                                                      1);
                        if (ASIC_IS_AVIVO(rdev)) {
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_property,
                                                              UNDERSCAN_OFF);
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_hborder_property,
                                                              0);
-                               drm_connector_attach_property(&radeon_connector->base,
+                               drm_object_attach_property(&radeon_connector->base.base,
                                                              rdev->mode_info.underscan_vborder_property,
                                                              0);
                        }
@@ -1806,7 +1806,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                                if (!radeon_connector->ddc_bus)
                                        DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                        }
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      dev->mode_config.scaling_mode_property,
                                                      DRM_MODE_SCALE_FULLSCREEN);
                        subpixel_order = SubPixelHorizontalRGB;
@@ -1819,10 +1819,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                        drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
                        drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
                        radeon_connector->dac_load_detect = true;
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.load_detect_property,
                                                      1);
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.tv_std_property,
                                                      radeon_atombios_get_tv_info(rdev));
                        /* no HPD on analog connectors */
@@ -1843,7 +1843,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                                if (!radeon_connector->ddc_bus)
                                        DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                        }
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      dev->mode_config.scaling_mode_property,
                                                      DRM_MODE_SCALE_FULLSCREEN);
                        subpixel_order = SubPixelHorizontalRGB;
@@ -1922,7 +1922,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
                                DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                }
                radeon_connector->dac_load_detect = true;
-               drm_connector_attach_property(&radeon_connector->base,
+               drm_object_attach_property(&radeon_connector->base.base,
                                              rdev->mode_info.load_detect_property,
                                              1);
                /* no HPD on analog connectors */
@@ -1940,7 +1940,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
                                DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                }
                radeon_connector->dac_load_detect = true;
-               drm_connector_attach_property(&radeon_connector->base,
+               drm_object_attach_property(&radeon_connector->base.base,
                                              rdev->mode_info.load_detect_property,
                                              1);
                /* no HPD on analog connectors */
@@ -1959,7 +1959,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
                }
                if (connector_type == DRM_MODE_CONNECTOR_DVII) {
                        radeon_connector->dac_load_detect = true;
-                       drm_connector_attach_property(&radeon_connector->base,
+                       drm_object_attach_property(&radeon_connector->base.base,
                                                      rdev->mode_info.load_detect_property,
                                                      1);
                }
@@ -1983,10 +1983,10 @@ radeon_add_legacy_connector(struct drm_device *dev,
                 */
                if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480)
                        radeon_connector->dac_load_detect = false;
-               drm_connector_attach_property(&radeon_connector->base,
+               drm_object_attach_property(&radeon_connector->base.base,
                                              rdev->mode_info.load_detect_property,
                                              radeon_connector->dac_load_detect);
-               drm_connector_attach_property(&radeon_connector->base,
+               drm_object_attach_property(&radeon_connector->base.base,
                                              rdev->mode_info.tv_std_property,
                                              radeon_combios_get_tv_info(rdev));
                /* no HPD on analog connectors */
@@ -2002,7 +2002,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
                        if (!radeon_connector->ddc_bus)
                                DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
                }
-               drm_connector_attach_property(&radeon_connector->base,
+               drm_object_attach_property(&radeon_connector->base.base,
                                              dev->mode_config.scaling_mode_property,
                                              DRM_MODE_SCALE_FULLSCREEN);
                subpixel_order = SubPixelHorizontalRGB;
Motorola kernel-slsi