Commit 8b7d92ca authored by Ben Skeggs's avatar Ben Skeggs Committed by Lyude Paul
Browse files

drm/nouveau/kms/nv50-: create connectors based on nvkm info 



- preparation for GSP-RM

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarDanilo Krummrich <me@dakr.org>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-43-lyude@redhat.com
parent 9c3361de

drivers/gpu/drm/nouveau/dispnv04/disp.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ nv04_display_create(struct drm_device *dev) 
	for (i = 0; i < dcb->entries; i++) {

		struct dcb_output *dcbent = &dcb->entry[i];



		connector = nouveau_connector_create(dev, dcbent);

		connector = nouveau_connector_create(dev, dcbent->connector);

		if (IS_ERR(connector))

			continue;

drivers/gpu/drm/nouveau/dispnv50/disp.c

+1 −1
Original line number Diff line number Diff line
@@ -2788,7 +2788,7 @@ nv50_display_create(struct drm_device *dev) 
			continue;

		}



		connector = nouveau_connector_create(dev, dcbe);

		connector = nouveau_connector_create(dev, dcbe->connector);

		if (IS_ERR(connector)) {

			nvif_outp_dtor(&outp->outp);

			kfree(outp);

drivers/gpu/drm/nouveau/include/nvif/conn.h

+15 −0
Original line number Diff line number Diff line
@@ -7,6 +7,21 @@ struct nvif_disp; 


struct nvif_conn {

	struct nvif_object object;

	u32 id;



	struct {

		enum {

			NVIF_CONN_VGA,

			NVIF_CONN_TV,

			NVIF_CONN_DVI_I,

			NVIF_CONN_DVI_D,

			NVIF_CONN_LVDS,

			NVIF_CONN_LVDS_SPWG,

			NVIF_CONN_HDMI,

			NVIF_CONN_DP,

			NVIF_CONN_EDP,

		} type;

	} info;

};



int nvif_conn_ctor(struct nvif_disp *, const char *name, int id, struct nvif_conn *);

drivers/gpu/drm/nouveau/include/nvif/if0011.h

+10 −0
Original line number Diff line number Diff line
@@ -7,6 +7,16 @@ union nvif_conn_args { 
		__u8 version;

		__u8 id;	/* DCB connector table index. */

		__u8 pad02[6];

#define NVIF_CONN_V0_VGA       0x00

#define NVIF_CONN_V0_TV        0x01

#define NVIF_CONN_V0_DVI_I     0x02

#define NVIF_CONN_V0_DVI_D     0x03

#define NVIF_CONN_V0_LVDS      0x04

#define NVIF_CONN_V0_LVDS_SPWG 0x05

#define NVIF_CONN_V0_HDMI      0x06

#define NVIF_CONN_V0_DP        0x07

#define NVIF_CONN_V0_EDP       0x08

		__u8 type;

	} v0;

};

drivers/gpu/drm/nouveau/nouveau_connector.c

+64 −67
Original line number Diff line number Diff line
@@ -1275,15 +1275,13 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb) 
}



struct drm_connector *

nouveau_connector_create(struct drm_device *dev,

			 const struct dcb_output *dcbe)

nouveau_connector_create(struct drm_device *dev, int index)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	struct nouveau_display *disp = nouveau_display(dev);

	struct nouveau_connector *nv_connector = NULL;

	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;

	int index = dcbe->connector;

	int type, ret = 0;

	bool dummy;
@@ -1305,41 +1303,52 @@ nouveau_connector_create(struct drm_device *dev, 
	nv_connector->index = index;

	INIT_WORK(&nv_connector->irq_work, nouveau_dp_irq);



	/* attempt to parse vbios connector type and hotplug gpio */

	nv_connector->dcb = olddcb_conn(dev, index);

	if (nv_connector->dcb) {

		u32 entry = ROM16(nv_connector->dcb[0]);

		if (olddcb_conntab(dev)[3] >= 4)

			entry |= (u32)ROM16(nv_connector->dcb[2]) << 16;

	if (disp->disp.conn_mask & BIT(nv_connector->index)) {

		ret = nvif_conn_ctor(&disp->disp, nv_connector->base.name, nv_connector->index,

				     &nv_connector->conn);

		if (ret) {

			kfree(nv_connector);

			return ERR_PTR(ret);

		}



		nv_connector->type = nv_connector->dcb[0];

		switch (nv_connector->conn.info.type) {

		case NVIF_CONN_VGA      : type = DCB_CONNECTOR_VGA; break;

		case NVIF_CONN_DVI_I    : type = DCB_CONNECTOR_DVI_I; break;

		case NVIF_CONN_DVI_D    : type = DCB_CONNECTOR_DVI_D; break;

		case NVIF_CONN_LVDS     : type = DCB_CONNECTOR_LVDS; break;

		case NVIF_CONN_LVDS_SPWG: type = DCB_CONNECTOR_LVDS_SPWG; break;

		case NVIF_CONN_DP       : type = DCB_CONNECTOR_DP; break;

		case NVIF_CONN_EDP      : type = DCB_CONNECTOR_eDP; break;

		case NVIF_CONN_HDMI     : type = DCB_CONNECTOR_HDMI_0; break;

		default:

			WARN_ON(1);

			return NULL;

		}



		nv_connector->type = type;

	} else {

		u8 *dcb = olddcb_conn(dev, nv_connector->index);



		if (dcb)

			nv_connector->type = dcb[0];

		else

			nv_connector->type = DCB_CONNECTOR_NONE;



		/* attempt to parse vbios connector type and hotplug gpio */

		if (nv_connector->type != DCB_CONNECTOR_NONE) {

			if (drm_conntype_from_dcb(nv_connector->type) ==

						  DRM_MODE_CONNECTOR_Unknown) {

				NV_WARN(drm, "unknown connector type %02x\n",

					nv_connector->type);

				nv_connector->type = DCB_CONNECTOR_NONE;

			}



		/* Gigabyte NX85T */

		if (nv_match_device(dev, 0x0421, 0x1458, 0x344c)) {

			if (nv_connector->type == DCB_CONNECTOR_HDMI_1)

				nv_connector->type = DCB_CONNECTOR_DVI_I;

		}



		/* Gigabyte GV-NX86T512H */

		if (nv_match_device(dev, 0x0402, 0x1458, 0x3455)) {

			if (nv_connector->type == DCB_CONNECTOR_HDMI_1)

				nv_connector->type = DCB_CONNECTOR_DVI_I;

		}

	} else {

		nv_connector->type = DCB_CONNECTOR_NONE;

		}



		/* no vbios data, or an unknown dcb connector type - attempt to

		 * figure out something suitable ourselves

		 */

	if (nv_connector->type == DCB_CONNECTOR_NONE) {

		struct nouveau_drm *drm = nouveau_drm(dev);

		if (nv_connector->type == DCB_CONNECTOR_NONE &&

		    !WARN_ON(drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA)) {

			struct dcb_table *dcbt = &drm->vbios.dcb;

			u32 encoders = 0;

			int i;
@@ -1349,12 +1358,6 @@ nouveau_connector_create(struct drm_device *dev, 
					encoders |= (1 << dcbt->entry[i].type);

			}



		if (encoders & (1 << DCB_OUTPUT_DP)) {

			if (encoders & (1 << DCB_OUTPUT_TMDS))

				nv_connector->type = DCB_CONNECTOR_DP;

			else

				nv_connector->type = DCB_CONNECTOR_eDP;

		} else

			if (encoders & (1 << DCB_OUTPUT_TMDS)) {

				if (encoders & (1 << DCB_OUTPUT_ANALOG))

					nv_connector->type = DCB_CONNECTOR_DVI_I;
@@ -1371,6 +1374,7 @@ nouveau_connector_create(struct drm_device *dev, 
				nv_connector->type = DCB_CONNECTOR_TV_0;

			}

		}

	}



	type = drm_conntype_from_dcb(nv_connector->type);

	if (type == DRM_MODE_CONNECTOR_LVDS)
@@ -1414,14 +1418,7 @@ nouveau_connector_create(struct drm_device *dev, 
	drm_connector_helper_add(connector, &nouveau_connector_helper_funcs);

	connector->polled = DRM_CONNECTOR_POLL_CONNECT;



	if (nv_connector->dcb && (disp->disp.conn_mask & BIT(nv_connector->index))) {

		ret = nvif_conn_ctor(&disp->disp, nv_connector->base.name, nv_connector->index,

				     &nv_connector->conn);

		if (ret) {

			kfree(nv_connector);

			return ERR_PTR(ret);

		}



	if (nvif_object_constructed(&nv_connector->conn.object)) {

		ret = nvif_conn_event_ctor(&nv_connector->conn, "kmsHotplug",

					   nouveau_connector_hotplug,

					   NVIF_CONN_EVENT_V0_PLUG | NVIF_CONN_EVENT_V0_UNPLUG,