Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/radeon/radeon_encoders.c

+5 −5
Original line number Diff line number Diff line
@@ -604,13 +604,13 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
		else

			return ATOM_ENCODER_MODE_DVI;

		break;

	case CONNECTOR_DVI_A:

	case CONNECTOR_VGA:

	case DRM_MODE_CONNECTOR_DVIA:

	case DRM_MODE_CONNECTOR_VGA:

		return ATOM_ENCODER_MODE_CRT;

		break;

	case CONNECTOR_STV:

	case CONNECTOR_CTV:

	case CONNECTOR_DIN:

	case DRM_MODE_CONNECTOR_Composite:

	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_9PinDIN:

		/* fix me */

		return ATOM_ENCODER_MODE_TV;

		/*return ATOM_ENCODER_MODE_CV;*/

drivers/gpu/drm/radeon/radeon_mode.h

+0 −26
Original line number Diff line number Diff line
@@ -46,32 +46,6 @@ struct radeon_device; 
#define to_radeon_encoder(x) container_of(x, struct radeon_encoder, 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 {

	RMX_OFF,

	RMX_FULL,