[PATCH 1/2] drm: simple_kms_helper: make connector optional at init time

Andrea Merello andrea.merello at gmail.com
Tue Aug 23 14:05:57 UTC 2016


drm_simple_display_pipe_init() pretendes to attach a connector
to the display pipe.

In case a drm bridge has to be used, then it's the bridge that
takes care of connectors.

This patch makes the connector parameter optional for
drm_simple_display_pipe_init(), so that a drm bridge could
handle connector by itslef later.

Signed-off-by: Andrea Merello <andrea.merello at gmail.com>
Cc: David Airlie <airlied at linux.ie>
Cc: Noralf Trønnes <noralf at tronnes.org>
Cc: Daniel Vetter <daniel at ffwll.ch>

diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
index 0a02efe..3a48c7c 100644
--- a/drivers/gpu/drm/drm_simple_kms_helper.c
+++ b/drivers/gpu/drm/drm_simple_kms_helper.c
@@ -139,7 +139,7 @@ static const struct drm_plane_funcs drm_simple_kms_plane_funcs = {
  * @funcs: callbacks for the display pipe (optional)
  * @formats: array of supported formats (%DRM_FORMAT_*)
  * @format_count: number of elements in @formats
- * @connector: connector to attach and register
+ * @connector: connector to attach and register (optional)
  *
  * Sets up a display pipeline which consist of a really simple
  * plane-crtc-encoder pipe coupled with the provided connector.
@@ -181,7 +181,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev,
 	encoder->possible_crtcs = 1 << drm_crtc_index(crtc);
 	ret = drm_encoder_init(dev, encoder, &drm_simple_kms_encoder_funcs,
 			       DRM_MODE_ENCODER_NONE, NULL);
-	if (ret)
+	if (ret || !connector)
 		return ret;

 	return drm_mode_connector_attach_encoder(connector, encoder);
--
2.7.4


More information about the dri-devel mailing list