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

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

drm/radeon/kms: rework atombios_get_encoder_mode() 



This should give us more reliable results if the table
is called before an active device is set.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent ba7e05e9

drivers/gpu/drm/radeon/radeon_encoders.c

+9 −14
Original line number Diff line number Diff line
@@ -660,21 +660,16 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
	if (radeon_encoder_is_dp_bridge(encoder))

		return ATOM_ENCODER_MODE_DP;



	/* DVO is always DVO */

	if (radeon_encoder->encoder_id == ATOM_ENCODER_MODE_DVO)

		return ATOM_ENCODER_MODE_DVO;



	connector = radeon_get_connector_for_encoder(encoder);

	if (!connector) {

		switch (radeon_encoder->encoder_id) {

		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:

		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

		case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:

		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1:

			return ATOM_ENCODER_MODE_DVI;

		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:

		case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:

		default:

			return ATOM_ENCODER_MODE_CRT;

		}

	}

	/* if we don't have an active device yet, just use one of

	 * the connectors tied to the encoder.

	 */

	if (!connector)

		connector = radeon_get_connector_for_encoder_init(encoder);

	radeon_connector = to_radeon_connector(connector);



	switch (connector->connector_type) {