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

Commit 8f1a6086 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: tidy connector/encoder creation a little 



Create connectors before encoders to avoid having to do another loop across
encoder list whenever we create a new connector.  This allows us to pass
the connector to the encoder creation functions, and avoid using a
create_resources() callback since we can now call it directly.

This can also potentially modify the connector ordering on nv50.  On cards
where the DCB connector and encoder tables are in the same order, things
will be unchanged.  However, there's some cards where the ordering between
the tables differ, and in one case, leads us to naming the connectors
"wrongly".

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3195c5f9

drivers/gpu/drm/nouveau/nouveau_bios.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct dcb_connector_table_entry { 
	enum dcb_connector_type type;

	uint8_t index2;

	uint8_t gpio_tag;

	void *drm;

};



struct dcb_connector_table {

drivers/gpu/drm/nouveau/nouveau_connector.c

+15 −36
Original line number Diff line number Diff line
@@ -729,66 +729,62 @@ nouveau_connector_funcs_lvds = { 
	.force = nouveau_connector_force

};



int

nouveau_connector_create(struct drm_device *dev,

			 struct dcb_connector_table_entry *dcb)

struct drm_connector *

nouveau_connector_create(struct drm_device *dev, int index)

{

	const struct drm_connector_funcs *funcs = &nouveau_connector_funcs;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_connector *nv_connector = NULL;

	struct dcb_connector_table_entry *dcb = NULL;

	struct drm_connector *connector;

	struct drm_encoder *encoder;

	int type, ret = 0;



	NV_DEBUG_KMS(dev, "\n");



	if (index >= dev_priv->vbios.dcb.connector.entries)

		return ERR_PTR(-EINVAL);



	dcb = &dev_priv->vbios.dcb.connector.entry[index];

	if (dcb->drm)

		return dcb->drm;



	switch (dcb->type) {

	case DCB_CONNECTOR_NONE:

		return 0;

	case DCB_CONNECTOR_VGA:

		NV_INFO(dev, "Detected a VGA connector\n");

		type = DRM_MODE_CONNECTOR_VGA;

		break;

	case DCB_CONNECTOR_TV_0:

	case DCB_CONNECTOR_TV_1:

	case DCB_CONNECTOR_TV_3:

		NV_INFO(dev, "Detected a TV connector\n");

		type = DRM_MODE_CONNECTOR_TV;

		break;

	case DCB_CONNECTOR_DVI_I:

		NV_INFO(dev, "Detected a DVI-I connector\n");

		type = DRM_MODE_CONNECTOR_DVII;

		break;

	case DCB_CONNECTOR_DVI_D:

		NV_INFO(dev, "Detected a DVI-D connector\n");

		type = DRM_MODE_CONNECTOR_DVID;

		break;

	case DCB_CONNECTOR_HDMI_0:

	case DCB_CONNECTOR_HDMI_1:

		NV_INFO(dev, "Detected a HDMI connector\n");

		type = DRM_MODE_CONNECTOR_HDMIA;

		break;

	case DCB_CONNECTOR_LVDS:

		NV_INFO(dev, "Detected a LVDS connector\n");

		type = DRM_MODE_CONNECTOR_LVDS;

		funcs = &nouveau_connector_funcs_lvds;

		break;

	case DCB_CONNECTOR_DP:

		NV_INFO(dev, "Detected a DisplayPort connector\n");

		type = DRM_MODE_CONNECTOR_DisplayPort;

		break;

	case DCB_CONNECTOR_eDP:

		NV_INFO(dev, "Detected an eDP connector\n");

		type = DRM_MODE_CONNECTOR_eDP;

		break;

	default:

		NV_ERROR(dev, "unknown connector type: 0x%02x!!\n", dcb->type);

		return -EINVAL;

		return ERR_PTR(-EINVAL);

	}



	nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL);

	if (!nv_connector)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);

	nv_connector->dcb = dcb;

	connector = &nv_connector->base;
@@ -799,24 +795,6 @@ nouveau_connector_create(struct drm_device *dev, 
	drm_connector_init(dev, connector, funcs, type);

	drm_connector_helper_add(connector, &nouveau_connector_helper_funcs);



	/* attach encoders */

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



		if (nv_encoder->dcb->connector != dcb->index)

			continue;



		if (get_slave_funcs(nv_encoder))

			get_slave_funcs(nv_encoder)->create_resources(encoder, connector);



		drm_mode_connector_attach_encoder(connector, encoder);

	}



	if (!connector->encoder_ids[0]) {

		NV_WARN(dev, "  no encoders, ignoring\n");

		goto fail;

	}



	/* Check if we need dithering enabled */

	if (dcb->type == DCB_CONNECTOR_LVDS) {

		bool dummy, is_24bit = false;
@@ -877,11 +855,12 @@ nouveau_connector_create(struct drm_device *dev, 
	}



	drm_sysfs_connector_add(connector);

	return 0;

	dcb->drm = connector;

	return dcb->drm;



fail:

	drm_connector_cleanup(connector);

	kfree(connector);

	return ret;

	return ERR_PTR(ret);



}

drivers/gpu/drm/nouveau/nouveau_connector.h

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static inline struct nouveau_connector *nouveau_connector( 
	return container_of(con, struct nouveau_connector, base);

}



int nouveau_connector_create(struct drm_device *,

			     struct dcb_connector_table_entry *);

struct drm_connector *

nouveau_connector_create(struct drm_device *, int index);



#endif /* __NOUVEAU_CONNECTOR_H__ */

drivers/gpu/drm/nouveau/nouveau_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -1072,13 +1072,13 @@ extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd, 
				 unsigned long arg);



/* nv04_dac.c */

extern int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry);

extern int nv04_dac_create(struct drm_connector *, struct dcb_entry *);

extern uint32_t nv17_dac_sample_load(struct drm_encoder *encoder);

extern int nv04_dac_output_offset(struct drm_encoder *encoder);

extern void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable);



/* nv04_dfp.c */

extern int nv04_dfp_create(struct drm_device *dev, struct dcb_entry *entry);

extern int nv04_dfp_create(struct drm_connector *, struct dcb_entry *);

extern int nv04_dfp_get_bound_head(struct drm_device *dev, struct dcb_entry *dcbent);

extern void nv04_dfp_bind_head(struct drm_device *dev, struct dcb_entry *dcbent,

			       int head, bool dl);
@@ -1087,10 +1087,10 @@ extern void nv04_dfp_update_fp_control(struct drm_encoder *encoder, int mode); 


/* nv04_tv.c */

extern int nv04_tv_identify(struct drm_device *dev, int i2c_index);

extern int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry);

extern int nv04_tv_create(struct drm_connector *, struct dcb_entry *);



/* nv17_tv.c */

extern int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry);

extern int nv17_tv_create(struct drm_connector *, struct dcb_entry *);



/* nv04_display.c */

extern int nv04_display_create(struct drm_device *);

drivers/gpu/drm/nouveau/nouveau_encoder.h

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ static inline struct drm_encoder *to_drm_encoder(struct nouveau_encoder *enc) 


struct nouveau_connector *

nouveau_encoder_connector_get(struct nouveau_encoder *encoder);

int nv50_sor_create(struct drm_device *dev, struct dcb_entry *entry);

int nv50_dac_create(struct drm_device *dev, struct dcb_entry *entry);

int nv50_sor_create(struct drm_connector *, struct dcb_entry *);

int nv50_dac_create(struct drm_connector *, struct dcb_entry *);



struct bit_displayport_encoder_table {

	uint32_t match;