linux-next: manual merge of the drm-misc tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/nouveau/nouveau_connector.c

between commit:

  1b254b791d7b ("drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create")

from Linus' tree and commit:

  8b7d92cad953 ("drm/nouveau/kms/nv50-: create connectors based on nvkm info")

from the drm-misc tree.

I fixed it up (I think, see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/nouveau/nouveau_connector.c
index 79ea30aac31f,94498c15b50e..000000000000
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@@ -1295,70 -1303,76 +1303,75 @@@ nouveau_connector_create(struct drm_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;
- 
- 		nv_connector->type = nv_connector->dcb[0];
- 		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;
+ 	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);
++			goto drm_conn_err;
  		}
  
- 		/* 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;
+ 		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;
  		}
  
- 		/* 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;
- 		}
+ 		nv_connector->type = type;
  	} else {
- 		nv_connector->type = DCB_CONNECTOR_NONE;
- 	}
+ 		u8 *dcb = olddcb_conn(dev, nv_connector->index);
  
- 	/* 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);
- 		struct dcb_table *dcbt = &drm->vbios.dcb;
- 		u32 encoders = 0;
- 		int i;
+ 		if (dcb)
+ 			nv_connector->type = dcb[0];
+ 		else
+ 			nv_connector->type = DCB_CONNECTOR_NONE;
  
- 		for (i = 0; i < dcbt->entries; i++) {
- 			if (dcbt->entry[i].connector == nv_connector->index)
- 				encoders |= (1 << dcbt->entry[i].type);
+ 		/* 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;
+ 			}
  		}
  
- 		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;
- 			else
- 				nv_connector->type = DCB_CONNECTOR_DVI_D;
- 		} else
- 		if (encoders & (1 << DCB_OUTPUT_ANALOG)) {
- 			nv_connector->type = DCB_CONNECTOR_VGA;
- 		} else
- 		if (encoders & (1 << DCB_OUTPUT_LVDS)) {
- 			nv_connector->type = DCB_CONNECTOR_LVDS;
- 		} else
- 		if (encoders & (1 << DCB_OUTPUT_TV)) {
- 			nv_connector->type = DCB_CONNECTOR_TV_0;
+ 		/* no vbios data, or an unknown dcb connector type - attempt to
+ 		 * figure out something suitable ourselves
+ 		 */
+ 		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;
+ 
+ 			for (i = 0; i < dcbt->entries; i++) {
+ 				if (dcbt->entry[i].connector == nv_connector->index)
+ 					encoders |= (1 << dcbt->entry[i].type);
+ 			}
+ 
+ 			if (encoders & (1 << DCB_OUTPUT_TMDS)) {
+ 				if (encoders & (1 << DCB_OUTPUT_ANALOG))
+ 					nv_connector->type = DCB_CONNECTOR_DVI_I;
+ 				else
+ 					nv_connector->type = DCB_CONNECTOR_DVI_D;
+ 			} else
+ 			if (encoders & (1 << DCB_OUTPUT_ANALOG)) {
+ 				nv_connector->type = DCB_CONNECTOR_VGA;
+ 			} else
+ 			if (encoders & (1 << DCB_OUTPUT_LVDS)) {
+ 				nv_connector->type = DCB_CONNECTOR_LVDS;
+ 			} else
+ 			if (encoders & (1 << DCB_OUTPUT_TV)) {
+ 				nv_connector->type = DCB_CONNECTOR_TV_0;
+ 			}
  		}
  	}
  
@@@ -1367,11 -1387,10 +1386,9 @@@
  		ret = nouveau_bios_parse_lvds_table(dev, 0, &dummy, &dummy);
  		if (ret) {
  			NV_ERROR(drm, "Error parsing LVDS table, disabling\n");
--			kfree(nv_connector);
--			return ERR_PTR(ret);
++			goto drm_conn_err;
  		}
  
- 		funcs = &nouveau_connector_funcs_lvds;
  		break;
  	case DRM_MODE_CONNECTOR_DisplayPort:
  	case DRM_MODE_CONNECTOR_eDP:

Attachment: pgpz5shZ3dSPs.pgp
Description: OpenPGP digital signature