kms: flatten setup_kms into _cogl_winsys_kms_display_setup

Since _cogl_winsys_kms_display_setup was basically just calling
setup_kms() it made sense to fold the code of setup_kms() back into the
_cogl_winsys_kms_display_setup() function.

Reviewed-by: Rob Bradford <rob@linux.intel.com>

cogl/winsys/cogl-winsys-egl.c

@@ -1092,9 +1092,7 @@ _cogl_winsys_display_setup (CoglDisplay *display,
 #endif
 
 #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
-  if (!_cogl_winsys_kms_display_setup (&egl_renderer->kms_renderer,
+  if (!_cogl_winsys_kms_display_setup (display, error))
-                                       &egl_display->kms_display,
-                                       error))
     goto error;
 #endif
 

cogl/winsys/cogl-winsys-kms.c

@@ -55,69 +55,6 @@
 
 static const char device_name[] = "/dev/dri/card0";
 
-static gboolean
-setup_kms (CoglRendererKMS *kms_renderer,
-           CoglDisplayKMS  *kms_display,
-           GError         **error)
-{
-  drmModeRes *resources;
-  drmModeConnector *connector;
-  drmModeEncoder *encoder;
-  int i;
-
-  resources = drmModeGetResources (kms_renderer->fd);
-  if (!resources)
-    {
-      g_set_error (error, COGL_WINSYS_ERROR,
-                   COGL_WINSYS_ERROR_INIT,
-                   "drmModeGetResources failed");
-      return FALSE;
-    }
-
-  for (i = 0; i < resources->count_connectors; i++)
-    {
-      connector = drmModeGetConnector (kms_renderer->fd, resources->connectors[i]);
-      if (connector == NULL)
-        continue;
-
-      if (connector->connection == DRM_MODE_CONNECTED &&
-          connector->count_modes > 0)
-        break;
-
-      drmModeFreeConnector(connector);
-    }
-
-  if (i == resources->count_connectors)
-    {
-      g_set_error (error, COGL_WINSYS_ERROR,
-                   COGL_WINSYS_ERROR_INIT,
-                   "No currently active connector found");
-      return FALSE;
-    }
-
-  for (i = 0; i < resources->count_encoders; i++)
-    {
-      encoder = drmModeGetEncoder (kms_renderer->fd, resources->encoders[i]);
-
-      if (encoder == NULL)
-        continue;
-
-      if (encoder->encoder_id == connector->encoder_id)
-        break;
-
-      drmModeFreeEncoder (encoder);
-    }
-
-  kms_display->saved_crtc = drmModeGetCrtc (kms_renderer->fd,
-                                            kms_display->encoder->crtc_id);
-
-  kms_display->connector = connector;
-  kms_display->encoder = encoder;
-  kms_display->mode = connector->modes[0];
-
-  return TRUE;
-}
-
 gboolean
 _cogl_winsys_kms_connect (CoglRendererKMS  *kms_renderer,
                           GError          **error)
@@ -172,13 +109,66 @@ close_fd:
 }
 
 gboolean
-_cogl_winsys_kms_display_setup (CoglRendererKMS *kms_renderer,
+_cogl_winsys_kms_display_setup (CoglDisplay *display, GError **error)
-                                CoglDisplayKMS  *kms_display,
-                                GError         **error)
 {
-  if (!setup_kms (kms_renderer, kms_display, error))
+  CoglDisplayEGL *egl_display = display->winsys;
-    return FALSE;
+  CoglDisplayKMS *kms_display = &egl_display->kms_display;
+  CoglRendererEGL *egl_renderer = display->renderer->winsys;
+  CoglRendererKMS *kms_renderer = &egl_renderer->kms_renderer;
+  drmModeRes *resources;
+  drmModeConnector *connector;
+  drmModeEncoder *encoder;
+  int i;
 
+  resources = drmModeGetResources (kms_renderer->fd);
+  if (!resources)
+    {
+      g_set_error (error, COGL_WINSYS_ERROR,
+                   COGL_WINSYS_ERROR_INIT,
+                   "drmModeGetResources failed");
+      return FALSE;
+    }
+
+  for (i = 0; i < resources->count_connectors; i++)
+    {
+      connector = drmModeGetConnector (kms_renderer->fd, resources->connectors[i]);
+      if (connector == NULL)
+        continue;
+
+      if (connector->connection == DRM_MODE_CONNECTED &&
+          connector->count_modes > 0)
+        break;
+
+      drmModeFreeConnector(connector);
+    }
+
+  if (i == resources->count_connectors)
+    {
+      g_set_error (error, COGL_WINSYS_ERROR,
+                   COGL_WINSYS_ERROR_INIT,
+                   "No currently active connector found");
+      return FALSE;
+    }
+
+  for (i = 0; i < resources->count_encoders; i++)
+    {
+      encoder = drmModeGetEncoder (kms_renderer->fd, resources->encoders[i]);
+
+      if (encoder == NULL)
+        continue;
+
+      if (encoder->encoder_id == connector->encoder_id)
+        break;
+
+      drmModeFreeEncoder (encoder);
+    }
+
+  kms_display->saved_crtc = drmModeGetCrtc (kms_renderer->fd,
+                                            kms_display->encoder->crtc_id);
+
+  kms_display->connector = connector;
+  kms_display->encoder = encoder;
+  kms_display->mode = connector->modes[0];
   kms_display->width = kms_display->mode.hdisplay;
   kms_display->height = kms_display->mode.vdisplay;
 

cogl/winsys/cogl-winsys-kms.h

@@ -78,9 +78,8 @@ _cogl_winsys_kms_onscreen_deinit (CoglRendererKMS *kms_renderer,
                                   CoglOnscreenKMS *kms_onscreen);
 
 gboolean
-_cogl_winsys_kms_display_setup (CoglRendererKMS *kms_renderer,
+_cogl_winsys_kms_display_setup (CoglDisplay  *display,
-                                CoglDisplayKMS  *kms_display,
+                                GError      **error);
-                                GError         **error);
 
 void
 _cogl_winsys_kms_swap_buffers (CoglRendererKMS *kms_renderer,