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

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

drm/radeon/kms: move panel mode setup into encoder mode set 



Needs to happen earlier in the mode set.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 3fa47d9e

drivers/gpu/drm/radeon/atombios_dp.c

+10 −12
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector) 
	return false;

}



static void radeon_dp_set_panel_mode(struct drm_encoder *encoder,

int radeon_dp_get_panel_mode(struct drm_encoder *encoder,

			     struct drm_connector *connector)

{

	struct drm_device *dev = encoder->dev;
@@ -558,7 +558,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, 
	int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;



	if (!ASIC_IS_DCE4(rdev))

		return;

		return panel_mode;



	if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) ==

	    ENCODER_OBJECT_ID_NUTMEG)
@@ -572,14 +572,7 @@ static void radeon_dp_set_panel_mode(struct drm_encoder *encoder, 
			panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;

	}



	atombios_dig_encoder_setup(encoder,

				   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,

				   panel_mode);



	if ((connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&

	    (panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {

		radeon_write_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_SET, 1);

	}

	return panel_mode;

}



void radeon_dp_set_link_config(struct drm_connector *connector,
@@ -717,6 +710,8 @@ static void radeon_dp_set_tp(struct radeon_dp_link_train_info *dp_info, int tp) 


static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)

{

	struct radeon_encoder *radeon_encoder = to_radeon_encoder(dp_info->encoder);

	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;

	u8 tmp;



	/* power up the sink */
@@ -732,7 +727,10 @@ static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info) 
		radeon_write_dpcd_reg(dp_info->radeon_connector,

				      DP_DOWNSPREAD_CTRL, 0);



	radeon_dp_set_panel_mode(dp_info->encoder, dp_info->connector);

	if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&

	    (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {

		radeon_write_dpcd_reg(dp_info->radeon_connector, DP_EDP_CONFIGURATION_SET, 1);

	}



	/* set the lane count on the sink */

	tmp = dp_info->dp_lane_count;

drivers/gpu/drm/radeon/atombios_encoders.c

+11 −0
Original line number Diff line number Diff line
@@ -1811,10 +1811,21 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, 
	case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:

	case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:

		if (ASIC_IS_DCE4(rdev)) {

			struct drm_connector *connector = radeon_get_connector_for_encoder(encoder);

			struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;



			if (!connector)

				dig->panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;

			else

				dig->panel_mode = radeon_dp_get_panel_mode(encoder, connector);



			/* disable the transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE, 0, 0);

			/* setup and enable the encoder */

			atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_SETUP, 0);

			atombios_dig_encoder_setup(encoder,

						   ATOM_ENCODER_CMD_SETUP_PANEL_MODE,

						   dig->panel_mode);



			/* enable the transmitter */

			atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);

drivers/gpu/drm/radeon/radeon_mode.h

+3 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ struct radeon_encoder_atom_dig { 
	struct backlight_device *bl_dev;

	int dpms_mode;

	uint8_t backlight_level;

	int panel_mode;

};



struct radeon_encoder_atom_dac {
@@ -482,6 +483,8 @@ extern void radeon_dp_link_train(struct drm_encoder *encoder, 
extern bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector);

extern u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector);

extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector);

extern int radeon_dp_get_panel_mode(struct drm_encoder *encoder,

				    struct drm_connector *connector);

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

extern void radeon_atom_encoder_init(struct radeon_device *rdev);

extern void radeon_atom_dcpll_init(struct radeon_device *rdev);