1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index ccba95f83d1..844c513f724 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -604,13 +604,13 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
                else
                        return ATOM_ENCODER_MODE_DVI;
                break;
-        case CONNECTOR_DVI_A:
+        case DRM_MODE_CONNECTOR_DVIA:
-        case CONNECTOR_VGA:
+        case DRM_MODE_CONNECTOR_VGA:
                return ATOM_ENCODER_MODE_CRT;
                break;
-        case CONNECTOR_STV:
+        case DRM_MODE_CONNECTOR_Composite:
-        case CONNECTOR_CTV:
+        case DRM_MODE_CONNECTOR_SVIDEO:
-        case CONNECTOR_DIN:
+        case DRM_MODE_CONNECTOR_9PinDIN:
                /* fix me */
                return ATOM_ENCODER_MODE_TV;
                /*return ATOM_ENCODER_MODE_CV;*/

diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index ccba95f83d1..844c513f724 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -604,13 +604,13 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
604	else	604	else
605	return ATOM_ENCODER_MODE_DVI;	605	return ATOM_ENCODER_MODE_DVI;
606	break;	606	break;
607	case CONNECTOR_DVI_A:	607	case DRM_MODE_CONNECTOR_DVIA:
608	case CONNECTOR_VGA:	608	case DRM_MODE_CONNECTOR_VGA:
609	return ATOM_ENCODER_MODE_CRT;	609	return ATOM_ENCODER_MODE_CRT;
610	break;	610	break;
611	case CONNECTOR_STV:	611	case DRM_MODE_CONNECTOR_Composite:
612	case CONNECTOR_CTV:	612	case DRM_MODE_CONNECTOR_SVIDEO:
613	case CONNECTOR_DIN:	613	case DRM_MODE_CONNECTOR_9PinDIN:
614	/* fix me */	614	/* fix me */
615	return ATOM_ENCODER_MODE_TV;	615	return ATOM_ENCODER_MODE_TV;
616	/return ATOM_ENCODER_MODE_CV;/	616	/return ATOM_ENCODER_MODE_CV;/