Commit a5899fcc authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie

drm/radeon/kms: fix typo in atom connector type handling

Also remove the problematic enums that were unused
remnants from the ddx.
Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 43b19f16
...@@ -604,13 +604,13 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) ...@@ -604,13 +604,13 @@ atombios_get_encoder_mode(struct drm_encoder *encoder)
else else
return ATOM_ENCODER_MODE_DVI; return ATOM_ENCODER_MODE_DVI;
break; break;
case CONNECTOR_DVI_A: case DRM_MODE_CONNECTOR_DVIA:
case CONNECTOR_VGA: case DRM_MODE_CONNECTOR_VGA:
return ATOM_ENCODER_MODE_CRT; return ATOM_ENCODER_MODE_CRT;
break; 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 */ /* fix me */
return ATOM_ENCODER_MODE_TV; return ATOM_ENCODER_MODE_TV;
/*return ATOM_ENCODER_MODE_CV;*/ /*return ATOM_ENCODER_MODE_CV;*/
......
...@@ -46,32 +46,6 @@ struct radeon_device; ...@@ -46,32 +46,6 @@ struct radeon_device;
#define to_radeon_encoder(x) container_of(x, struct radeon_encoder, base) #define to_radeon_encoder(x) container_of(x, struct radeon_encoder, base)
#define to_radeon_framebuffer(x) container_of(x, struct radeon_framebuffer, base) #define to_radeon_framebuffer(x) container_of(x, struct radeon_framebuffer, base)
enum radeon_connector_type {
CONNECTOR_NONE,
CONNECTOR_VGA,
CONNECTOR_DVI_I,
CONNECTOR_DVI_D,
CONNECTOR_DVI_A,
CONNECTOR_STV,
CONNECTOR_CTV,
CONNECTOR_LVDS,
CONNECTOR_DIGITAL,
CONNECTOR_SCART,
CONNECTOR_HDMI_TYPE_A,
CONNECTOR_HDMI_TYPE_B,
CONNECTOR_0XC,
CONNECTOR_0XD,
CONNECTOR_DIN,
CONNECTOR_DISPLAY_PORT,
CONNECTOR_UNSUPPORTED
};
enum radeon_dvi_type {
DVI_AUTO,
DVI_DIGITAL,
DVI_ANALOG
};
enum radeon_rmx_type { enum radeon_rmx_type {
RMX_OFF, RMX_OFF,
RMX_FULL, RMX_FULL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment