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

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

drm/radeon: add new atombios encoder/transmitter interfaces 



These allow overriding the encoder id with the frontend,
we need this for setting up MST.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 00a014e8

drivers/gpu/drm/radeon/atombios_encoders.c

+24 −5
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ union dig_encoder_control { 
};



void

atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode)

atombios_dig_encoder_setup2(struct drm_encoder *encoder, int action, int panel_mode, int enc_override)

{

	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;
@@ -920,6 +920,9 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo 


			if (ENCODER_MODE_IS_DP(args.v3.ucEncoderMode) && (dp_clock == 270000))

				args.v1.ucConfig |= ATOM_ENCODER_CONFIG_V3_DPLINKRATE_2_70GHZ;

			if (enc_override != -1)

				args.v3.acConfig.ucDigSel = enc_override;

			else

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

			args.v3.ucBitPerColor = radeon_atom_get_bpc(encoder);

			break;
@@ -948,6 +951,10 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo 
				else

					args.v1.ucConfig |= ATOM_ENCODER_CONFIG_V4_DPLINKRATE_1_62GHZ;

			}



			if (enc_override != -1)

				args.v4.acConfig.ucDigSel = enc_override;

			else

				args.v4.acConfig.ucDigSel = dig->dig_encoder;

			args.v4.ucBitPerColor = radeon_atom_get_bpc(encoder);

			if (hpd_id == RADEON_HPD_NONE)
@@ -969,6 +976,12 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mo 


}



void

atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode)

{

	atombios_dig_encoder_setup2(encoder, action, panel_mode, -1);

}



union dig_transmitter_control {

	DIG_TRANSMITTER_CONTROL_PS_ALLOCATION v1;

	DIG_TRANSMITTER_CONTROL_PARAMETERS_V2 v2;
@@ -978,7 +991,7 @@ union dig_transmitter_control { 
};



void

atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t lane_num, uint8_t lane_set)

atombios_dig_transmitter_setup2(struct drm_encoder *encoder, int action, uint8_t lane_num, uint8_t lane_set, int fe)

{

	struct drm_device *dev = encoder->dev;

	struct radeon_device *rdev = dev->dev_private;
@@ -1328,7 +1341,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t 
				args.v5.asConfig.ucHPDSel = 0;

			else

				args.v5.asConfig.ucHPDSel = hpd_id + 1;

			args.v5.ucDigEncoderSel = 1 << dig_encoder;

			args.v5.ucDigEncoderSel = (fe != -1) ? (1 << fe) : (1 << dig_encoder);

			args.v5.ucDPLaneSet = lane_set;

			break;

		default:
@@ -1344,6 +1357,12 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t 
	atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);

}



void

atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t lane_num, uint8_t lane_set)

{

	atombios_dig_transmitter_setup2(encoder, action, lane_num, lane_set, -1);

}



bool

atombios_set_edp_panel_power(struct drm_connector *connector, int action)

{

drivers/gpu/drm/radeon/radeon_mode.h

+4 −0
Original line number Diff line number Diff line
@@ -726,11 +726,15 @@ extern ssize_t 
radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg);



extern void atombios_dig_encoder_setup(struct drm_encoder *encoder, int action, int panel_mode);

extern void atombios_dig_encoder_setup2(struct drm_encoder *encoder, int action, int panel_mode, int enc_override);

extern void radeon_atom_encoder_init(struct radeon_device *rdev);

extern void radeon_atom_disp_eng_pll_init(struct radeon_device *rdev);

extern void atombios_dig_transmitter_setup(struct drm_encoder *encoder,

					   int action, uint8_t lane_num,

					   uint8_t lane_set);

extern void atombios_dig_transmitter_setup2(struct drm_encoder *encoder,

					    int action, uint8_t lane_num,

					    uint8_t lane_set, int fe);

extern void radeon_atom_ext_encoder_setup_ddc(struct drm_encoder *encoder);

extern struct drm_encoder *radeon_get_external_encoder(struct drm_encoder *encoder);

void radeon_atom_copy_swap(u8 *dst, u8 *src, u8 num_bytes, bool to_le);