unify connector, i2c handling for atom and legacy

[android-x86/external-libdrm.git] / linux-core / radeon_connectors.c

diff --git a/linux-core/radeon_connectors.c b/linux-core/radeon_connectors.c
index 344b4f7..2cc0be0 100644 (file)
--- a/linux-core/radeon_connectors.c
+++ b/linux-core/radeon_connectors.c
@@ -36,9 +36,9 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
        int ret = 0;
        struct edid *edid;
 
-       avivo_i2c_do_lock(radeon_connector, 1);
+       radeon_i2c_do_lock(radeon_connector, 1);
        edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
-       avivo_i2c_do_lock(radeon_connector, 0);
+       radeon_i2c_do_lock(radeon_connector, 0);
        if (edid) {
                drm_mode_connector_update_edid_property(&radeon_connector->base, edid);
                ret = drm_add_edid_modes(&radeon_connector->base, edid);
@@ -53,7 +53,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
                return ret;
 
        radeon_encoder_update_panel_size(lvds_encoder, connector);
-#endif  
+#endif
        return ret;
 }
 
@@ -111,33 +111,33 @@ struct drm_connector_funcs radeon_lvds_connector_funcs = {
        .destroy = radeon_connector_destroy,
 };
 
-static int radeon_atom_vga_get_modes(struct drm_connector *connector)
+static int radeon_vga_get_modes(struct drm_connector *connector)
 {
        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
        int ret;
 
        ret = radeon_ddc_get_modes(radeon_connector);
-       
+
        return ret;
 }
 
-static int radeon_atom_vga_mode_valid(struct drm_connector *connector,
+static int radeon_vga_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
 
        return MODE_OK;
 }
 
-static enum drm_connector_status radeon_atom_vga_detect(struct drm_connector *connector)
+static enum drm_connector_status radeon_vga_detect(struct drm_connector *connector)
 {
        struct edid *edid;
        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
        struct drm_encoder *encoder;
        struct drm_encoder_helper_funcs *encoder_funcs;
 
-       avivo_i2c_do_lock(radeon_connector, 1);
+       radeon_i2c_do_lock(radeon_connector, 1);
        edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
-       avivo_i2c_do_lock(radeon_connector, 0);
+       radeon_i2c_do_lock(radeon_connector, 0);
        if (edid) {
                kfree(edid);
                return connector_status_connected;
@@ -152,20 +152,20 @@ static enum drm_connector_status radeon_atom_vga_detect(struct drm_connector *co
        return encoder_funcs->detect(encoder, connector);
 }
 
-struct drm_connector_helper_funcs radeon_atom_vga_connector_helper_funcs = {
-       .get_modes = radeon_atom_vga_get_modes,
-       .mode_valid = radeon_atom_vga_mode_valid,
+struct drm_connector_helper_funcs radeon_vga_connector_helper_funcs = {
+       .get_modes = radeon_vga_get_modes,
+       .mode_valid = radeon_vga_mode_valid,
        .best_encoder = radeon_best_single_encoder,
 };
 
-struct drm_connector_funcs radeon_atom_vga_connector_funcs = {
-       .detect = radeon_atom_vga_detect,
+struct drm_connector_funcs radeon_vga_connector_funcs = {
+       .detect = radeon_vga_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
        .destroy = radeon_connector_destroy,
 };
 
 
-static enum drm_connector_status radeon_atom_dvi_detect(struct drm_connector *connector)
+static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connector)
 {
        struct edid *edid;
        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
@@ -175,9 +175,9 @@ static enum drm_connector_status radeon_atom_dvi_detect(struct drm_connector *co
        int i;
        enum drm_connector_status ret;
 
-       avivo_i2c_do_lock(radeon_connector, 1);
+       radeon_i2c_do_lock(radeon_connector, 1);
        edid = drm_get_edid(&radeon_connector->base, &radeon_connector->ddc_bus->adapter);
-       avivo_i2c_do_lock(radeon_connector, 0);
+       radeon_i2c_do_lock(radeon_connector, 0);
        if (edid) {
                /* if the monitor is digital - set the bits */
                if (edid->digital)
@@ -212,7 +212,7 @@ static enum drm_connector_status radeon_atom_dvi_detect(struct drm_connector *co
 }
 
 /* okay need to be smart in here about which encoder to pick */
-struct drm_encoder *radeon_atom_dvi_encoder(struct drm_connector *connector)
+struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)
 {
        int enc_id = connector->encoder_ids[0];
        struct radeon_connector *radeon_connector = to_radeon_connector(connector);
@@ -253,14 +253,14 @@ struct drm_encoder *radeon_atom_dvi_encoder(struct drm_connector *connector)
        return NULL;
 }
 
-struct drm_connector_helper_funcs radeon_atom_dvi_connector_helper_funcs = {
-       .get_modes = radeon_atom_vga_get_modes,
-       .mode_valid = radeon_atom_vga_mode_valid,
-       .best_encoder = radeon_atom_dvi_encoder,
+struct drm_connector_helper_funcs radeon_dvi_connector_helper_funcs = {
+       .get_modes = radeon_vga_get_modes,
+       .mode_valid = radeon_vga_mode_valid,
+       .best_encoder = radeon_dvi_encoder,
 };
 
-struct drm_connector_funcs radeon_atom_dvi_connector_funcs = {
-       .detect = radeon_atom_dvi_detect,
+struct drm_connector_funcs radeon_dvi_connector_funcs = {
+       .detect = radeon_dvi_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
        .destroy = radeon_connector_destroy,
 };
@@ -272,12 +272,12 @@ static struct connector_funcs {
        struct drm_connector_helper_funcs *helper_funcs;
        int conn_type;
        char *i2c_id;
-} connector_fns[] = { 
+} connector_fns[] = {
        { CONNECTOR_NONE, NULL, NULL, DRM_MODE_CONNECTOR_Unknown },
-       { CONNECTOR_VGA, &radeon_atom_vga_connector_funcs, &radeon_atom_vga_connector_helper_funcs, DRM_MODE_CONNECTOR_VGA , "VGA"},
+       { CONNECTOR_VGA, &radeon_vga_connector_funcs, &radeon_vga_connector_helper_funcs, DRM_MODE_CONNECTOR_VGA , "VGA"},
        { CONNECTOR_LVDS, &radeon_lvds_connector_funcs, &radeon_lvds_connector_helper_funcs, DRM_MODE_CONNECTOR_LVDS, "LVDS" },
-       { CONNECTOR_DVI_A, &radeon_atom_vga_connector_funcs, &radeon_atom_vga_connector_helper_funcs, DRM_MODE_CONNECTOR_DVIA, "DVI" },
-       { CONNECTOR_DVI_I, &radeon_atom_dvi_connector_funcs, &radeon_atom_dvi_connector_helper_funcs, DRM_MODE_CONNECTOR_DVII, "DVI" },
+       { CONNECTOR_DVI_A, &radeon_vga_connector_funcs, &radeon_vga_connector_helper_funcs, DRM_MODE_CONNECTOR_DVIA, "DVI" },
+       { CONNECTOR_DVI_I, &radeon_dvi_connector_funcs, &radeon_dvi_connector_helper_funcs, DRM_MODE_CONNECTOR_DVII, "DVI" },
 
 #if 0
        { CONNECTOR_DVI_D, radeon_vga_connector_funcs, radeon_vga_connector_helper_funcs, DRM_MODE_CONNECTOR_VGA },
@@ -294,14 +294,14 @@ static struct connector_funcs {
        { CONNECTOR_DIN, radeon_vga_connector_funcs, radeon_vga_connector_helper_funcs, DRM_MODE_CONNECTOR_VGA },
        { CONNECTOR_DISPLAY_PORT, radeon_vga_connector_funcs, radeon_vga_connector_helper_funcs, DRM_MODE_CONNECTOR_VGA },
 #endif
-};     
-       
+};
+
 struct drm_connector *radeon_connector_add(struct drm_device *dev, int bios_index)
 {
        struct radeon_connector *radeon_connector;
        struct drm_radeon_private *dev_priv = dev->dev_private;
        struct radeon_mode_info *mode_info = &dev_priv->mode_info;
-       struct drm_connector *connector;        
+       struct drm_connector *connector;
        int table_idx;
 
        for (table_idx = 0; table_idx < ARRAY_SIZE(connector_fns); table_idx++) {
@@ -323,7 +323,7 @@ struct drm_connector *radeon_connector_add(struct drm_device *dev, int bios_inde
                           connector_fns[table_idx].conn_type);
 
        drm_connector_helper_add(&radeon_connector->base, connector_fns[table_idx].helper_funcs);
-       
+
        if (mode_info->bios_connector[bios_index].ddc_i2c.valid) {
                radeon_connector->ddc_bus = radeon_i2c_create(dev, &mode_info->bios_connector[bios_index].ddc_i2c,
                                                              connector_fns[table_idx].i2c_id);