From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-intel tree with the drm tree Date: Thu, 29 Aug 2013 14:09:06 +1000 Message-ID: <20130829140906.2c4b5dea4453266265018c0b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__29_Aug_2013_14_09_06_+1000_CXyhuRdgVG/puWv0" Return-path: Sender: linux-next-owner@vger.kernel.org To: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Shobhit Kumar , Ilia Mirkin , Dave Airlie List-Id: dri-devel@lists.freedesktop.org --Signature=_Thu__29_Aug_2013_14_09_06_+1000_CXyhuRdgVG/puWv0 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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). =20 --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au 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=20 * Connector and encoder types. */ static struct drm_conn_prop_enum_list drm_connector_enum_list[] =3D -{ { 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" }, }; =20 static const struct drm_prop_enum_list drm_encoder_enum_list[] =3D @@@ -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" }, }; =20 +void drm_connector_ida_init(void) +{ + int i; + + for (i =3D 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 =3D 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]; --Signature=_Thu__29_Aug_2013_14_09_06_+1000_CXyhuRdgVG/puWv0 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAEBCAAGBQJSHslmAAoJEECxmPOUX5FEXbMP/jIG0EMVlIS7RmN4mwHQFACT 5BcOuQMhH2eAU8l3Rnc0LA7BhVKmRunbxYmQQh5ZrmgBLCVFfb/6L/WXzE0D9JsR dDgWpxx07P/sxJ4wYiKLwUpHvDTHY2TSrqVr+Mn2wGwFAY7ukVOYfW9ehV92F0ib j1H+oC34nMt/AbNCL8XwMqlJfhgDe6dGnUR8aW5JMhX4MZXGZzS4URyALFYB+aN8 HVqo745Qqd8vKb7/KMWswoWQsfUZGQvd+VQlStwRSuWj/9yomV67WMAeP9mnauCu QDUn+5zdWCycfEo3EYgzic+/Rx0uGKzGszgktX0QvQXAn1/vmxMncEsiN81DZCKV UBYW4DWSd5ySj24+45nWBq6ephFlqZj7i767WC9ejzB9UJM+qk2t0tHI0+FrsYMn Vjldri+cJEFGAO3KFUZogm47oyu+bVafktNP/iXNxqwIsFmGi5R4Jigxj9hPFqf0 06VBr0YCIfTCqHpuc9SiHRJYh+BVBBpVaZl4tjutW4sJiss1XLPL3TQOqwgL5xrL fKvPB+TfF0Rabme+c1AEq3GRFvadWc88PVT/yXc3J8bAsq0Gxe+YC1pT3ssQll6s fzK1ispJ01MdAtMvMInARCf3ffVOsMgBrUEn9QHdnZnFtlSfgJ+h7maw/B4h1UyS HwZ1IeCObqbdI4ZHpYww =M3pV -----END PGP SIGNATURE----- --Signature=_Thu__29_Aug_2013_14_09_06_+1000_CXyhuRdgVG/puWv0--