radeon_ms: use radeon connector type insted of drm

diff --git a/shared-core/radeon_ms_combios.c b/shared-core/radeon_ms_combios.c
index ecd4bd0..65609af 100644 (file)
--- a/shared-core/radeon_ms_combios.c
+++ b/shared-core/radeon_ms_combios.c
@@ -144,13 +144,13 @@ static int radeon_ms_combios_connector_add(struct drm_device *dev,
        connector->i2c_reg = i2c_reg;
 
        switch (connector->type) {
-       case ConnectorVGA:
+       case CONNECTOR_VGA:
                sprintf(connector->name, "VGA");
                break;
-       case ConnectorDVII:
+       case CONNECTOR_DVI_I:
                sprintf(connector->name, "DVI-I");
                break;
-       case ConnectorDVID:
+       case CONNECTOR_DVI_D:
                sprintf(connector->name, "DVI-D");
                break;
        default:
@@ -279,7 +279,7 @@ int radeon_ms_connectors_from_combios(struct drm_device *dev)
                switch (connector_type) {
                case BIOS_CONNECTOR_TYPE__CRT:
                        ret = radeon_ms_combios_connector_add(dev, c,
-                                                             ConnectorVGA,
+                                                             CONNECTOR_VGA,
                                                              i2c_reg);
                        if (ret) {
                                return ret;
@@ -288,7 +288,7 @@ int radeon_ms_connectors_from_combios(struct drm_device *dev)
                        break;
                case BIOS_CONNECTOR_TYPE__DVI_I:
                        ret = radeon_ms_combios_connector_add(dev, c,
-                                                             ConnectorDVII,
+                                                             CONNECTOR_DVI_I,
                                                              i2c_reg);
                        if (ret) {
                                return ret;
@@ -297,7 +297,7 @@ int radeon_ms_connectors_from_combios(struct drm_device *dev)
                        break;
                case BIOS_CONNECTOR_TYPE__DVI_D:
                        ret = radeon_ms_combios_connector_add(dev, c,
-                                                             ConnectorDVID,
+                                                             CONNECTOR_DVI_D,
                                                              i2c_reg);
                        if (ret) {
                                return ret;

diff --git a/shared-core/radeon_ms_dac.c b/shared-core/radeon_ms_dac.c
index 297623a..e631294 100644 (file)
--- a/shared-core/radeon_ms_dac.c
+++ b/shared-core/radeon_ms_dac.c
@@ -370,7 +370,7 @@ int radeon_ms_dac2_mode_set(struct radeon_ms_output *output,
        case CHIP_R430:
        case CHIP_R480:
                if (connector->type != CONNECTOR_CTV &&
-                               connector->type != CONNECTOR_STV) {
+                   connector->type != CONNECTOR_STV) {
                        state->dac_cntl2 |= DAC_CNTL2__DAC2_CLK_SEL;
                }
        }

diff --git a/shared-core/radeon_ms_properties.c b/shared-core/radeon_ms_properties.c
index 2bd45dc..baf2a7f 100644 (file)
--- a/shared-core/radeon_ms_properties.c
+++ b/shared-core/radeon_ms_properties.c
@@ -58,7 +58,7 @@ struct radeon_ms_output radeon_ms_dac2 = {
 };
 
 struct radeon_ms_connector radeon_ms_vga = {
-       NULL, NULL, NULL, ConnectorVGA, MT_NONE, 0, GPIO_DDC1,
+       NULL, NULL, NULL, CONNECTOR_VGA, MT_NONE, 0, GPIO_DDC1,
        {
                0, -1, -1, -1, -1, -1, -1, -1
        },
@@ -66,7 +66,7 @@ struct radeon_ms_connector radeon_ms_vga = {
 };
 
 struct radeon_ms_connector radeon_ms_dvi_i_2 = {
-       NULL, NULL, NULL, ConnectorDVII, MT_NONE, 0, GPIO_DDC2,
+       NULL, NULL, NULL, CONNECTOR_DVI_I, MT_NONE, 0, GPIO_DDC2,
        {
                1, -1, -1, -1, -1, -1, -1, -1
        },