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

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

drm/radeon/kms: re-apply 2007d633 



Got accidently reverted by c93bb85b

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent cc84ef3f

drivers/gpu/drm/radeon/radeon_encoders.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -1400,8 +1400,14 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su 
	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

		if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {

			radeon_encoder->rmx_type = RMX_FULL;

			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS);

			radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder);

		} else {

			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);

			drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);

			radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);

			radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);

		}

		drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);

		drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);

		break;

		break;

	}

	}