linux-next: manual merge of the drm-intel tree with the drm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/drm_crtc.c between commit b21e3afe2357 ("drm: use ida to
allocate connector ids") from the drm tree and commit 88cd8b8b1503 ("drm:
add MIPI DSI encoder and connector types") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).
 
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/drm_crtc.c
index 54b4169,190827d..0000000
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@@ -186,22 -193,23 +186,23 @@@ struct drm_conn_prop_enum_list 
   * Connector and encoder types.
   */
  static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
 -{	{ DRM_MODE_CONNECTOR_Unknown, "Unknown", 0 },
 -	{ DRM_MODE_CONNECTOR_VGA, "VGA", 0 },
 -	{ DRM_MODE_CONNECTOR_DVII, "DVI-I", 0 },
 -	{ DRM_MODE_CONNECTOR_DVID, "DVI-D", 0 },
 -	{ DRM_MODE_CONNECTOR_DVIA, "DVI-A", 0 },
 -	{ DRM_MODE_CONNECTOR_Composite, "Composite", 0 },
 -	{ DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO", 0 },
 -	{ DRM_MODE_CONNECTOR_LVDS, "LVDS", 0 },
 -	{ DRM_MODE_CONNECTOR_Component, "Component", 0 },
 -	{ DRM_MODE_CONNECTOR_9PinDIN, "DIN", 0 },
 -	{ DRM_MODE_CONNECTOR_DisplayPort, "DP", 0 },
 -	{ DRM_MODE_CONNECTOR_HDMIA, "HDMI-A", 0 },
 -	{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B", 0 },
 -	{ DRM_MODE_CONNECTOR_TV, "TV", 0 },
 -	{ DRM_MODE_CONNECTOR_eDP, "eDP", 0 },
 -	{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual", 0},
 +{	{ DRM_MODE_CONNECTOR_Unknown, "Unknown" },
 +	{ DRM_MODE_CONNECTOR_VGA, "VGA" },
 +	{ DRM_MODE_CONNECTOR_DVII, "DVI-I" },
 +	{ DRM_MODE_CONNECTOR_DVID, "DVI-D" },
 +	{ DRM_MODE_CONNECTOR_DVIA, "DVI-A" },
 +	{ DRM_MODE_CONNECTOR_Composite, "Composite" },
 +	{ DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO" },
 +	{ DRM_MODE_CONNECTOR_LVDS, "LVDS" },
 +	{ DRM_MODE_CONNECTOR_Component, "Component" },
 +	{ DRM_MODE_CONNECTOR_9PinDIN, "DIN" },
 +	{ DRM_MODE_CONNECTOR_DisplayPort, "DP" },
 +	{ DRM_MODE_CONNECTOR_HDMIA, "HDMI-A" },
 +	{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B" },
 +	{ DRM_MODE_CONNECTOR_TV, "TV" },
 +	{ DRM_MODE_CONNECTOR_eDP, "eDP" },
 +	{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual" },
+ 	{ DRM_MODE_CONNECTOR_DSI, "DSI" },
  };
  
  static const struct drm_prop_enum_list drm_encoder_enum_list[] =
@@@ -211,24 -219,9 +212,25 @@@
  	{ DRM_MODE_ENCODER_LVDS, "LVDS" },
  	{ DRM_MODE_ENCODER_TVDAC, "TV" },
  	{ DRM_MODE_ENCODER_VIRTUAL, "Virtual" },
+ 	{ DRM_MODE_ENCODER_DSI, "DSI" },
  };
  
 +void drm_connector_ida_init(void)
 +{
 +	int i;
 +
 +	for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++)
 +		ida_init(&drm_connector_enum_list[i].ida);
 +}
 +
 +void drm_connector_ida_destroy(void)
 +{
 +	int i;
 +
 +	for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++)
 +		ida_destroy(&drm_connector_enum_list[i].ida);
 +}
 +
  const char *drm_get_encoder_name(const struct drm_encoder *encoder)
  {
  	static char buf[32];

Attachment: pgp00000.pgp
Description: PGP signature