Changeset e79a025 in mainline for uspace/drv/fb/amdm37x_dispc/main.c

Timestamp:

2020-07-03T23:41:46Z (4 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fd11144

Parents:

edb57bc6 (diff), ddb844e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

jxsvoboda <5887334+jxsvoboda@…> (2020-07-03 23:41:46)

git-committer:

GitHub <noreply@…> (2020-07-03 23:41:46)

Message:

Merge pull request #200 from jxsvoboda/gfx

Display server

File:

• uspace/drv/fb/amdm37x_dispc/main.c (modified) (6 diffs)

uspace/drv/fb/amdm37x_dispc/main.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2020 Jiri Svoboda
  * Copyright (c) 2013 Jan Vesely
  * Copyright (c) 2011 Petr Koupy
@@ -35 +36 @@
  */
 
+#include <ddev_srv.h>
 #include <ddf/driver.h>
 #include <ddf/log.h>
 #include <errno.h>
+#include <ipcgfx/server.h>
 #include <str_error.h>
 #include <stdio.h>
-#include <graph.h>
 
 #include "amdm37x_dispc.h"
@@ -46 +48 @@
 #define NAME  "amdm37x_dispc"
 
-static void graph_vsl_connection(ipc_call_t *icall, void *arg)
+static void amdm37x_client_conn(ipc_call_t *icall, void *arg)
 {
-        visualizer_t *vsl;
+        amdm37x_dispc_t *dispc;
+        ddev_srv_t srv;
+        sysarg_t gc_id;
+        gfx_context_t *gc;
+        errno_t rc;
 
-        vsl = (visualizer_t *) ddf_fun_data_get((ddf_fun_t *)arg);
-        graph_visualizer_connection(vsl, icall, NULL);
+        dispc = (amdm37x_dispc_t *) ddf_dev_data_get(
+            ddf_fun_get_dev((ddf_fun_t *) arg));
+
+        gc_id = ipc_get_arg3(icall);
+
+        if (gc_id == 0) {
+                /* Set up protocol structure */
+                ddev_srv_initialize(&srv);
+                srv.ops = &amdm37x_ddev_ops;
+                srv.arg = dispc;
+
+                /* Handle connection */
+                ddev_conn(icall, &srv);
+        } else {
+                assert(gc_id == 42);
+
+                rc = gfx_context_new(&amdm37x_gc_ops, dispc, &gc);
+                if (rc != EOK)
+                        goto error;
+
+                /* GC connection */
+                gc_conn(icall, gc);
+        }
+
+        return;
+error:
+        async_answer_0(icall, rc);
 }
 
@@ -57 +88 @@
 {
         assert(dev);
-        /* Visualizer part */
-        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "viz");
+
+        ddf_fun_t *fun = ddf_fun_create(dev, fun_exposed, "a");
         if (!fun) {
-                ddf_log_error("Failed to create visualizer function.");
+                ddf_log_error("Failed to create display device function.");
                 return ENOMEM;
         }
 
-        visualizer_t *vis = ddf_fun_data_alloc(fun, sizeof(visualizer_t));
-        if (!vis) {
-                ddf_log_error("Failed to allocate visualizer structure.");
-                ddf_fun_destroy(fun);
-                return ENOMEM;
-        }
+        ddf_fun_set_conn_handler(fun, &amdm37x_client_conn);
 
-        graph_init_visualizer(vis);
-        vis->reg_svc_handle = ddf_fun_get_handle(fun);
-
-        ddf_fun_set_conn_handler(fun, graph_vsl_connection);
         /* Hw part */
         amdm37x_dispc_t *dispc =
@@ -84 +106 @@
         }
 
-        errno_t rc = amdm37x_dispc_init(dispc, vis);
+        errno_t rc = amdm37x_dispc_init(dispc, fun);
         if (rc != EOK) {
                 ddf_log_error("Failed to init dispc: %s.", str_error(rc));
@@ -100 +122 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, "visualizer");
+        rc = ddf_fun_add_to_category(fun, "display-device");
         if (rc != EOK) {
-                ddf_log_error("Failed to add function: %s to visualizer "
+                ddf_log_error("Failed to add function: %s to display device "
                     "category.", str_error(rc));
                 amdm37x_dispc_fini(dispc);