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

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

drm/radeon/kms: atom changes for DCE4.1 devices 



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

drivers/gpu/drm/radeon/radeon_asic.c

+3 −1
Original line number Diff line number Diff line
@@ -849,7 +849,9 @@ int radeon_asic_init(struct radeon_device *rdev) 
	if (rdev->flags & RADEON_SINGLE_CRTC)

		rdev->num_crtc = 1;

	else {

		if (ASIC_IS_DCE4(rdev))

		if (ASIC_IS_DCE41(rdev))

			rdev->num_crtc = 2;

		else if (ASIC_IS_DCE4(rdev))

			rdev->num_crtc = 6;

		else

			rdev->num_crtc = 2;

drivers/gpu/drm/radeon/radeon_encoders.c

+21 −4
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
 * DIG1/2 can drive UNIPHY0/1/2 link A or link B

 *

 * DCE 4.0

 * - 3 DIG transmitter blocks UNPHY0/1/2 (links A and B).

 * - 3 DIG transmitter blocks UNIPHY0/1/2 (links A and B).

 * Supports up to 6 digital outputs

 * - 6 DIG encoder blocks.

 * - DIG to PHY mapping is hardcoded
@@ -724,6 +724,12 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
 * DIG5 drives UNIPHY2 link A, A+B

 * DIG6 drives UNIPHY2 link B

 *

 * DCE 4.1

 * - 3 DIG transmitter blocks UNIPHY0/1/2 (links A and B).

 * Supports up to 6 digital outputs

 * - 2 DIG encoder blocks.

 * DIG1/2 can drive UNIPHY0/1/2 link A or link B

 *

 * Routing

 * crtc -> dig encoder -> UNIPHY/LVTMA (1 or 2 links)

 * Examples:
@@ -904,10 +910,16 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t 
		else

			args.v3.ucLaneNum = 4;



		if (ASIC_IS_DCE41(rdev)) {

			args.v3.acConfig.ucEncoderSel = dig->dig_encoder;

			if (dig->linkb)

				args.v3.acConfig.ucLinkSel = 1;

		} else {

			if (dig->linkb) {

				args.v3.acConfig.ucLinkSel = 1;

				args.v3.acConfig.ucEncoderSel = 1;

			}

		}



		/* Select the PLL for the PHY

		 * DP PHY should be clocked from external src if there is
@@ -1483,6 +1495,11 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder) 
	struct radeon_encoder_atom_dig *dig;

	uint32_t dig_enc_in_use = 0;



	/* on DCE41 and encoder can driver any phy so just crtc id */

	if (ASIC_IS_DCE41(rdev)) {

		return radeon_crtc->crtc_id;

	}



	if (ASIC_IS_DCE4(rdev)) {

		dig = radeon_encoder->enc_priv;

		switch (radeon_encoder->encoder_id) {