Commit 62afb4ad authored by José Roberto de Souza's avatar José Roberto de Souza Committed by Manasi Navare
Browse files

drm/connector: Allow max possible encoders to attach to a connector 



Currently we restrict the number of encoders that can be linked to
a connector to 3, increase it to match the maximum number of encoders
that can be initialized(32).

To more effiently do that lets switch from an array of encoder ids to
bitmask.

v2: Fixing missed return on amdgpu_dm_connector_to_encoder()

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190913232857.389834-2-jose.souza@intel.com
parent a92462d6

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+8 −15
Original line number Diff line number Diff line
@@ -217,11 +217,10 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector, 
	struct drm_encoder *encoder;

	const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private;

	bool connected;

	int i;



	best_encoder = connector_funcs->best_encoder(connector);



	drm_connector_for_each_possible_encoder(connector, encoder, i) {

	drm_connector_for_each_possible_encoder(connector, encoder) {

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

			connected = true;

		else
@@ -236,9 +235,8 @@ amdgpu_connector_find_encoder(struct drm_connector *connector, 
			       int encoder_type)

{

	struct drm_encoder *encoder;

	int i;



	drm_connector_for_each_possible_encoder(connector, encoder, i) {

	drm_connector_for_each_possible_encoder(connector, encoder) {

		if (encoder->encoder_type == encoder_type)

			return encoder;

	}
@@ -347,10 +345,9 @@ static struct drm_encoder * 
amdgpu_connector_best_single_encoder(struct drm_connector *connector)

{

	struct drm_encoder *encoder;

	int i;



	/* pick the first one */

	drm_connector_for_each_possible_encoder(connector, encoder, i)

	drm_connector_for_each_possible_encoder(connector, encoder)

		return encoder;



	return NULL;
@@ -1065,9 +1062,8 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
	/* find analog encoder */

	if (amdgpu_connector->dac_load_detect) {

		struct drm_encoder *encoder;

		int i;



		drm_connector_for_each_possible_encoder(connector, encoder, i) {

		drm_connector_for_each_possible_encoder(connector, encoder) {

			if (encoder->encoder_type != DRM_MODE_ENCODER_DAC &&

			    encoder->encoder_type != DRM_MODE_ENCODER_TVDAC)

				continue;
@@ -1117,9 +1113,8 @@ amdgpu_connector_dvi_encoder(struct drm_connector *connector) 
{

	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);

	struct drm_encoder *encoder;

	int i;



	drm_connector_for_each_possible_encoder(connector, encoder, i) {

	drm_connector_for_each_possible_encoder(connector, encoder) {

		if (amdgpu_connector->use_digital == true) {

			if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS)

				return encoder;
@@ -1134,7 +1129,7 @@ amdgpu_connector_dvi_encoder(struct drm_connector *connector) 


	/* then check use digitial */

	/* pick the first one */

	drm_connector_for_each_possible_encoder(connector, encoder, i)

	drm_connector_for_each_possible_encoder(connector, encoder)

		return encoder;



	return NULL;
@@ -1271,9 +1266,8 @@ u16 amdgpu_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *conn 
{

	struct drm_encoder *encoder;

	struct amdgpu_encoder *amdgpu_encoder;

	int i;



	drm_connector_for_each_possible_encoder(connector, encoder, i) {

	drm_connector_for_each_possible_encoder(connector, encoder) {

		amdgpu_encoder = to_amdgpu_encoder(encoder);



		switch (amdgpu_encoder->encoder_id) {
@@ -1292,10 +1286,9 @@ static bool amdgpu_connector_encoder_is_hbr2(struct drm_connector *connector) 
{

	struct drm_encoder *encoder;

	struct amdgpu_encoder *amdgpu_encoder;

	int i;

	bool found = false;



	drm_connector_for_each_possible_encoder(connector, encoder, i) {

	drm_connector_for_each_possible_encoder(connector, encoder) {

		amdgpu_encoder = to_amdgpu_encoder(encoder);

		if (amdgpu_encoder->caps & ATOM_ENCODER_CAP_RECORD_HBR2)

			found = true;

drivers/gpu/drm/amd/amdgpu/dce_virtual.c

+2 −3
Original line number Diff line number Diff line
@@ -260,15 +260,14 @@ static struct drm_encoder * 
dce_virtual_encoder(struct drm_connector *connector)

{

	struct drm_encoder *encoder;

	int i;



	drm_connector_for_each_possible_encoder(connector, encoder, i) {

	drm_connector_for_each_possible_encoder(connector, encoder) {

		if (encoder->encoder_type == DRM_MODE_ENCODER_VIRTUAL)

			return encoder;

	}



	/* pick the first one */

	drm_connector_for_each_possible_encoder(connector, encoder, i)

	drm_connector_for_each_possible_encoder(connector, encoder)

		return encoder;



	return NULL;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+7 −1
Original line number Diff line number Diff line
@@ -4792,7 +4792,13 @@ static int to_drm_connector_type(enum signal_type st) 


static struct drm_encoder *amdgpu_dm_connector_to_encoder(struct drm_connector *connector)

{

	return drm_encoder_find(connector->dev, NULL, connector->encoder_ids[0]);

	struct drm_encoder *encoder;



	/* There is only one encoder per connector */

	drm_connector_for_each_possible_encoder(connector, encoder)

		return encoder;



	return NULL;

}



static void amdgpu_dm_get_native_mode(struct drm_connector *connector)

drivers/gpu/drm/drm_client_modeset.c

+1 −2
Original line number Diff line number Diff line
@@ -415,9 +415,8 @@ static bool connector_has_possible_crtc(struct drm_connector *connector, 
					struct drm_crtc *crtc)

{

	struct drm_encoder *encoder;

	int i;



	drm_connector_for_each_possible_encoder(connector, encoder, i) {

	drm_connector_for_each_possible_encoder(connector, encoder) {

		if (encoder->possible_crtcs & drm_crtc_mask(crtc))

			return true;

	}

drivers/gpu/drm/drm_connector.c

+8 −23
Original line number Diff line number Diff line
@@ -365,8 +365,6 @@ EXPORT_SYMBOL(drm_connector_attach_edid_property); 
int drm_connector_attach_encoder(struct drm_connector *connector,

				 struct drm_encoder *encoder)

{

	int i;



	/*

	 * In the past, drivers have attempted to model the static association

	 * of connector to encoder in simple connector/encoder devices using a
@@ -381,18 +379,15 @@ int drm_connector_attach_encoder(struct drm_connector *connector, 
	if (WARN_ON(connector->encoder))

		return -EINVAL;



	for (i = 0; i < ARRAY_SIZE(connector->encoder_ids); i++) {

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

			connector->encoder_ids[i] = encoder->base.id;

	connector->possible_encoders |= drm_encoder_mask(encoder);



	return 0;

}

	}

	return -ENOMEM;

}

EXPORT_SYMBOL(drm_connector_attach_encoder);



/**

 * drm_connector_has_possible_encoder - check if the connector and encoder are assosicated with each other

 * drm_connector_has_possible_encoder - check if the connector and encoder are

 * associated with each other

 * @connector: the connector

 * @encoder: the encoder

 *
@@ -402,15 +397,7 @@ EXPORT_SYMBOL(drm_connector_attach_encoder); 
bool drm_connector_has_possible_encoder(struct drm_connector *connector,

					struct drm_encoder *encoder)

{

	struct drm_encoder *enc;

	int i;



	drm_connector_for_each_possible_encoder(connector, enc, i) {

		if (enc == encoder)

			return true;

	}



	return false;

	return connector->possible_encoders & drm_encoder_mask(encoder);

}

EXPORT_SYMBOL(drm_connector_has_possible_encoder);
@@ -2121,7 +2108,6 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
	int encoders_count = 0;

	int ret = 0;

	int copied = 0;

	int i;

	struct drm_mode_modeinfo u_mode;

	struct drm_mode_modeinfo __user *mode_ptr;

	uint32_t __user *encoder_ptr;
@@ -2136,14 +2122,13 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
	if (!connector)

		return -ENOENT;



	drm_connector_for_each_possible_encoder(connector, encoder, i)

		encoders_count++;

	encoders_count = hweight32(connector->possible_encoders);



	if ((out_resp->count_encoders >= encoders_count) && encoders_count) {

		copied = 0;

		encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);



		drm_connector_for_each_possible_encoder(connector, encoder, i) {

		drm_connector_for_each_possible_encoder(connector, encoder) {

			if (put_user(encoder->base.id, encoder_ptr + copied)) {

				ret = -EFAULT;

				goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE