compositor-drm: Be patient when output creation fails
authorBenjamin Franzke <benjaminfranzke@googlemail.com>
Fri, 7 Oct 2011 06:20:53 +0000 (08:20 +0200)
committerBenjamin Franzke <benjaminfranzke@googlemail.com>
Fri, 7 Oct 2011 07:56:54 +0000 (09:56 +0200)
Do not fail if e.g. only one of 3 connectors cant be enabled.
Could be that we just have not enough crtcs available.

compositor/compositor-drm.c

index 3519912..0f2f2c7 100644 (file)
@@ -570,8 +570,10 @@ create_outputs(struct drm_compositor *ec, int option_connector)
                    (option_connector == 0 ||
                     connector->connector_id == option_connector)) {
                        if (create_output_for_connector(ec, resources,
-                                                       connector, x, y) < 0)
-                               return -1;
+                                                       connector, x, y) < 0) {
+                               drmModeFreeConnector(connector);
+                               continue;
+                       }
 
                        x += container_of(ec->base.output_list.prev,
                                          struct wlsc_output,