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

Commit 7b71ca24 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/radeon: Use drm_connector_for_each_possible_encoder() 



Use drm_connector_for_each_possible_encoder() for iterating
connector->encoder_ids[]. A bit more convenient not having
to deal with the implementation details.

v2: Replace drm_for_each_connector_encoder_ids() with
    drm_connector_for_each_possible_encoder() (Daniel)

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180628131315.14156-7-ville.syrjala@linux.intel.com
parent ddba766d

drivers/gpu/drm/radeon/radeon_connectors.c

+26 −64
Original line number Original line Diff line number Diff line
@@ -244,23 +244,15 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c 
{

{

	struct drm_device *dev = connector->dev;

	struct drm_device *dev = connector->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct radeon_device *rdev = dev->dev_private;

	struct drm_encoder *best_encoder = NULL;

	struct drm_encoder *best_encoder;

	struct drm_encoder *encoder = NULL;

	struct drm_encoder *encoder;

	const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;

	const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;

	bool connected;

	bool connected;

	int i;

	int i;





	best_encoder = connector_funcs->best_encoder(connector);

	best_encoder = connector_funcs->best_encoder(connector);





	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

	drm_connector_for_each_possible_encoder(connector, encoder, i) {

		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev, NULL,

					   connector->encoder_ids[i]);

		if (!encoder)

			continue;



		if ((encoder == best_encoder) && (status == connector_status_connected))

		if ((encoder == best_encoder) && (status == connector_status_connected))

			connected = true;

			connected = true;

		else

		else
@@ -270,7 +262,6 @@ radeon_connector_update_scratch_regs(struct drm_connector *connector, enum drm_c 
			radeon_atombios_connected_scratch_regs(connector, encoder, connected);

			radeon_atombios_connected_scratch_regs(connector, encoder, connected);

		else

		else

			radeon_combios_connected_scratch_regs(connector, encoder, connected);

			radeon_combios_connected_scratch_regs(connector, encoder, connected);



	}

	}

}

}
@@ -279,17 +270,11 @@ static struct drm_encoder *radeon_find_encoder(struct drm_connector *connector, 
	struct drm_encoder *encoder;

	struct drm_encoder *encoder;

	int i;

	int i;





	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

	drm_connector_for_each_possible_encoder(connector, encoder, i) {

		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]);

		if (!encoder)

			continue;



		if (encoder->encoder_type == encoder_type)

		if (encoder->encoder_type == encoder_type)

			return encoder;

			return encoder;

	}

	}



	return NULL;

	return NULL;

}

}
@@ -393,10 +378,13 @@ static int radeon_ddc_get_modes(struct drm_connector *connector) 




static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)

static struct drm_encoder *radeon_best_single_encoder(struct drm_connector *connector)

{

{

	int enc_id = connector->encoder_ids[0];

	struct drm_encoder *encoder;

	/* pick the encoder ids */

	int i;

	if (enc_id)



		return drm_encoder_find(connector->dev, NULL, enc_id);

	/* pick the first one */

	drm_connector_for_each_possible_encoder(connector, encoder, i)

		return encoder;



	return NULL;

	return NULL;

}

}
@@ -436,19 +424,19 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector, 
	struct drm_device *dev = connector->dev;

	struct drm_device *dev = connector->dev;

	struct drm_connector *conflict;

	struct drm_connector *conflict;

	struct radeon_connector *radeon_conflict;

	struct radeon_connector *radeon_conflict;

	int i;





	list_for_each_entry(conflict, &dev->mode_config.connector_list, head) {

	list_for_each_entry(conflict, &dev->mode_config.connector_list, head) {

		struct drm_encoder *enc;

		int i;



		if (conflict == connector)

		if (conflict == connector)

			continue;

			continue;





		radeon_conflict = to_radeon_connector(conflict);

		radeon_conflict = to_radeon_connector(conflict);

		for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

			if (conflict->encoder_ids[i] == 0)

				break;





		drm_connector_for_each_possible_encoder(conflict, enc, i) {

			/* if the IDs match */

			/* if the IDs match */

			if (conflict->encoder_ids[i] == encoder->base.id) {

			if (enc == encoder) {

				if (conflict->status != connector_status_connected)

				if (conflict->status != connector_status_connected)

					continue;

					continue;
@@ -1256,7 +1244,7 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) 
	struct radeon_connector *radeon_connector = to_radeon_connector(connector);

	struct radeon_connector *radeon_connector = to_radeon_connector(connector);

	struct drm_encoder *encoder = NULL;

	struct drm_encoder *encoder = NULL;

	const struct drm_encoder_helper_funcs *encoder_funcs;

	const struct drm_encoder_helper_funcs *encoder_funcs;

	int i, r;

	int r;

	enum drm_connector_status ret = connector_status_disconnected;

	enum drm_connector_status ret = connector_status_disconnected;

	bool dret = false, broken_edid = false;

	bool dret = false, broken_edid = false;
@@ -1374,15 +1362,9 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) 




	/* find analog encoder */

	/* find analog encoder */

	if (radeon_connector->dac_load_detect) {

	if (radeon_connector->dac_load_detect) {

		for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

		int i;

			if (connector->encoder_ids[i] == 0)

				break;



			encoder = drm_encoder_find(connector->dev, NULL,

						   connector->encoder_ids[i]);

			if (!encoder)

				continue;





		drm_connector_for_each_possible_encoder(connector, encoder, i) {

			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&

			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&

			    encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)

			    encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)

				continue;

				continue;
@@ -1458,18 +1440,11 @@ radeon_dvi_detect(struct drm_connector *connector, bool force) 
/* okay need to be smart in here about which encoder to pick */

/* okay need to be smart in here about which encoder to pick */

static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)

static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector)

{

{

	int enc_id = connector->encoder_ids[0];

	struct radeon_connector *radeon_connector = to_radeon_connector(connector);

	struct radeon_connector *radeon_connector = to_radeon_connector(connector);

	struct drm_encoder *encoder;

	struct drm_encoder *encoder;

	int i;

	int i;

	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]);

		if (!encoder)

			continue;





	drm_connector_for_each_possible_encoder(connector, encoder, i) {

		if (radeon_connector->use_digital == true) {

		if (radeon_connector->use_digital == true) {

			if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS)

			if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS)

				return encoder;

				return encoder;
@@ -1484,8 +1459,9 @@ static struct drm_encoder *radeon_dvi_encoder(struct drm_connector *connector) 




	/* then check use digitial */

	/* then check use digitial */

	/* pick the first one */

	/* pick the first one */

	if (enc_id)

	drm_connector_for_each_possible_encoder(connector, encoder, i)

		return drm_encoder_find(connector->dev, NULL, enc_id);

		return encoder;



	return NULL;

	return NULL;

}

}
@@ -1628,14 +1604,7 @@ u16 radeon_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *conn 
	struct radeon_encoder *radeon_encoder;

	struct radeon_encoder *radeon_encoder;

	int i;

	int i;





	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

	drm_connector_for_each_possible_encoder(connector, encoder, i) {

		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]);

		if (!encoder)

			continue;



		radeon_encoder = to_radeon_encoder(encoder);

		radeon_encoder = to_radeon_encoder(encoder);





		switch (radeon_encoder->encoder_id) {

		switch (radeon_encoder->encoder_id) {
@@ -1657,14 +1626,7 @@ static bool radeon_connector_encoder_is_hbr2(struct drm_connector *connector) 
	int i;

	int i;

	bool found = false;

	bool found = false;





	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

	drm_connector_for_each_possible_encoder(connector, encoder, i) {

		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]);

		if (!encoder)

			continue;



		radeon_encoder = to_radeon_encoder(encoder);

		radeon_encoder = to_radeon_encoder(encoder);

		if (radeon_encoder->caps & ATOM_ENCODER_CAP_RECORD_HBR2)

		if (radeon_encoder->caps & ATOM_ENCODER_CAP_RECORD_HBR2)

			found = true;

			found = true;