Changeset 0b63dc2 in mainline

Timestamp:

2019-12-07T20:26:28Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

df1a019

Parents:

71cbe5c

Message:

Switch compositor → display server

Convert KFB from visualizer to display device interface. Add ability
of display device implementor to provide client with arg2, arg3 needed
to connect to GC.

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (2 diffs)
• app/init/init.c (modified) (5 diffs)
• drv/fb/kfb/kfb.c (modified) (1 diff)
• drv/fb/kfb/meson.build (modified) (1 diff)
• drv/fb/kfb/port.c (modified) (7 diffs)
• lib/ddev/include/ddev_srv.h (modified) (1 diff)
• lib/ddev/src/ddev.c (modified) (1 diff)
• lib/ddev/src/ddev_srv.c (modified) (2 diffs)
• lib/ddev/test/ddev.c (modified) (2 diffs)
• srv/hid/rfb/main.c (modified) (2 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -502 +502 @@
         errno_t rc;
 
-        if (argc < 2) {
-                print_syntax();
-                return 1;
-        }
-
-        if (str_cmp(argv[1], "console") == 0) {
+        if (argc < 2 || str_cmp(argv[1], "display") == 0) {
+                rc = demo_display();
+                if (rc != EOK)
+                        return 1;
+        } else if (str_cmp(argv[1], "console") == 0) {
                 rc = demo_console();
                 if (rc != EOK)
@@ -513 +512 @@
         } else if (str_cmp(argv[1], "canvas") == 0) {
                 rc = demo_canvas();
-                if (rc != EOK)
-                        return 1;
-        } else if (str_cmp(argv[1], "display") == 0) {
-                rc = demo_display();
                 if (rc != EOK)
                         return 1;

uspace/app/init/init.c

@@ -34 +34 @@
  */
 
+#include <fibril.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -47 +48 @@
 #include <config.h>
 #include <io/logctl.h>
+#include <vfs/vfs.h>
 #include <vol.h>
 #include "untar.h"
@@ -63 +65 @@
 #define APP_GETTERM  "/app/getterm"
 
-#define SRV_COMPOSITOR  "/srv/hid/compositor"
+#define SRV_DISPLAY  "/srv/hid/display"
 
 #define HID_INPUT              "hid/input"
@@ -254 +256 @@
 }
 
-static errno_t compositor(const char *isvc, const char *name)
-{
-        /* Wait for the input service to be ready */
-        service_id_t service_id;
-        errno_t rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
-                    str_error(rc));
-                return rc;
-        }
-
-        return srv_start(SRV_COMPOSITOR, isvc, name);
-}
-
-static int gui_start(const char *app, const char *srv_name)
-{
-        char winreg[50];
-        snprintf(winreg, sizeof(winreg), "%s%s%s", "comp", srv_name, "/winreg");
-
-        printf("%s: Spawning %s %s\n", NAME, app, winreg);
+static errno_t display_server(void)
+{
+        return srv_start(SRV_DISPLAY);
+}
+
+static int gui_start(const char *app)
+{
+        printf("%s: Spawning %s\n", NAME, app);
 
         task_id_t id;
         task_wait_t wait;
-        errno_t rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s %s (%s)\n", NAME, app,
-                    winreg, str_error(rc));
+        errno_t rc = task_spawnl(&id, &wait, app, app, NULL);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s (%s)\n", NAME, app,
+                    str_error(rc));
                 return -1;
         }
@@ -458 +448 @@
 
         if (!config_key_exists("console")) {
-                rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
+                rc = display_server();
                 if (rc == EOK) {
-                        gui_start("/app/barber", HID_COMPOSITOR_SERVER);
-                        gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
-                        gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+                        fibril_sleep(1);
+                        gui_start("/app/gfxdemo");
                 }
         }

uspace/drv/fb/kfb/kfb.c

@@ -36 +36 @@
 #include <errno.h>
 #include <stdio.h>
-#include <graph.h>
 #include "port.h"
 #include "kfb.h"

uspace/drv/fb/kfb/meson.build

@@ -29 +29 @@
 #
 
-deps = [ 'graph', 'softrend' ]
+deps = [ 'gfx', 'ipcgfx', 'ddev', 'softrend' ]
 src = files('port.c', 'kfb.c')

uspace/drv/fb/kfb/port.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2006 Jakub Vana
  * Copyright (c) 2006 Ondrej Palkovsky
@@ -38 +39 @@
 
 #include <abi/fb/visuals.h>
+#include <adt/list.h>
+#include <align.h>
+#include <as.h>
+#include <ddev_srv.h>
+#include <ddi.h>
+#include <ddf/log.h>
+#include <errno.h>
+#include <gfx/bitmap.h>
+#include <gfx/color.h>
+#include <gfx/coord.h>
+#include <io/mode.h>
+#include <io/pixelmap.h>
+#include <ipcgfx/server.h>
+#include <mem.h>
+#include <pixconv.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <errno.h>
-
 #include <stdlib.h>
-#include <mem.h>
-#include <as.h>
-#include <align.h>
-
 #include <sysinfo.h>
-#include <ddi.h>
-
-#include <adt/list.h>
-
-#include <io/mode.h>
-#include <io/pixelmap.h>
-#include <io/chargrid.h>
-
-#include <pixconv.h>
-
-#include <graph.h>
 
 #include "kfb.h"
 #include "port.h"
 
-#define FB_POS(x, y)  ((y) * kfb.scanline + (x) * kfb.pixel_bytes)
+#define FB_POS(fb, x, y)  ((y) * (fb)->scanline + (x) * (fb)->pixel_bytes)
 
 typedef struct {
+        ddf_fun_t *fun;
+
         sysarg_t paddr;
         sysarg_t width;
@@ -80 +81 @@
         size_t size;
         uint8_t *addr;
+
+        /** Current drawing color */
+        pixel_t color;
 } kfb_t;
 
-static kfb_t kfb;
-
-static vslmode_list_element_t pixel_mode;
-
-static errno_t kfb_claim(visualizer_t *vs)
-{
-        return physmem_map(kfb.paddr + kfb.offset,
-            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
-            AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);
-}
-
-static errno_t kfb_yield(visualizer_t *vs)
-{
+typedef struct {
+        kfb_t *kfb;
+        gfx_bitmap_alloc_t alloc;
+        gfx_rect_t rect;
+        bool myalloc;
+} kfb_bitmap_t;
+
+static errno_t kfb_ddev_get_gc(void *, sysarg_t *, sysarg_t *);
+
+static errno_t kfb_gc_set_color(void *, gfx_color_t *);
+static errno_t kfb_gc_fill_rect(void *, gfx_rect_t *);
+static errno_t kfb_gc_bitmap_create(void *, gfx_bitmap_params_t *,
+    gfx_bitmap_alloc_t *, void **);
+static errno_t kfb_gc_bitmap_destroy(void *);
+static errno_t kfb_gc_bitmap_render(void *, gfx_rect_t *, gfx_coord2_t *);
+static errno_t kfb_gc_bitmap_get_alloc(void *, gfx_bitmap_alloc_t *);
+
+static ddev_ops_t kfb_ddev_ops = {
+        .get_gc = kfb_ddev_get_gc
+};
+
+static gfx_context_ops_t kfb_gc_ops = {
+        .set_color = kfb_gc_set_color,
+        .fill_rect = kfb_gc_fill_rect,
+        .bitmap_create = kfb_gc_bitmap_create,
+        .bitmap_destroy = kfb_gc_bitmap_destroy,
+        .bitmap_render = kfb_gc_bitmap_render,
+        .bitmap_get_alloc = kfb_gc_bitmap_get_alloc
+};
+
+static errno_t kfb_ddev_get_gc(void *arg, sysarg_t *arg2, sysarg_t *arg3)
+{
+        kfb_t *kfb = (kfb_t *) arg;
+
+        *arg2 = ddf_fun_get_handle(kfb->fun);
+        *arg3 = 42;
+        return EOK;
+}
+
+/** Set color on KFB.
+ *
+ * Set drawing color on KFB GC.
+ *
+ * @param arg KFB
+ * @param color Color
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t kfb_gc_set_color(void *arg, gfx_color_t *color)
+{
+        kfb_t *kfb = (kfb_t *) arg;
+        uint16_t r, g, b;
+
+        gfx_color_get_rgb_i16(color, &r, &g, &b);
+        kfb->color = PIXEL(0, r >> 8, g >> 8, b >> 8);
+        return EOK;
+}
+
+/** Fill rectangle on KFB.
+ *
+ * @param arg KFB
+ * @param rect Rectangle
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t kfb_gc_fill_rect(void *arg, gfx_rect_t *rect)
+{
+        kfb_t *kfb = (kfb_t *) arg;
+        gfx_coord_t x, y;
+
+        // XXX We should handle p0.x > p1.x and p0.y > p1.y
+
+        for (y = rect->p0.y; y < rect->p1.y; y++) {
+                for (x = rect->p0.x; x < rect->p1.x; x++) {
+                        kfb->pixel2visual(kfb->addr + FB_POS(kfb, x, y),
+                            kfb->color);
+                }
+        }
+
+        return EOK;
+}
+
+/** Create bitmap in KFB GC.
+ *
+ * @param arg KFB
+ * @param params Bitmap params
+ * @param alloc Bitmap allocation info or @c NULL
+ * @param rbm Place to store pointer to new bitmap
+ * @return EOK on success or an error code
+ */
+errno_t kfb_gc_bitmap_create(void *arg, gfx_bitmap_params_t *params,
+    gfx_bitmap_alloc_t *alloc, void **rbm)
+{
+        kfb_t *kfb = (kfb_t *) arg;
+        kfb_bitmap_t *kfbbm = NULL;
+        gfx_coord2_t dim;
         errno_t rc;
 
-        if (vs->mode_set) {
-                vs->ops.handle_damage = NULL;
-        }
-
-        rc = physmem_unmap(kfb.addr);
-        if (rc != EOK)
-                return rc;
-
-        kfb.addr = NULL;
-        return EOK;
-}
-
-static errno_t kfb_handle_damage_pixels(visualizer_t *vs,
-    sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
-    sysarg_t x_offset, sysarg_t y_offset)
-{
-        pixelmap_t *map = &vs->cells;
-
-        if (x_offset == 0 && y_offset == 0) {
-                /* Faster damage routine ignoring offsets. */
-                for (sysarg_t y = y0; y < height + y0; ++y) {
-                        pixel_t *pixel = pixelmap_pixel_at(map, x0, y);
-                        for (sysarg_t x = x0; x < width + x0; ++x) {
-                                kfb.pixel2visual(kfb.addr + FB_POS(x, y), *pixel++);
-                        }
+        kfbbm = calloc(1, sizeof(kfb_bitmap_t));
+        if (kfbbm == NULL)
+                return ENOMEM;
+
+        gfx_coord2_subtract(&params->rect.p1, &params->rect.p0, &dim);
+        kfbbm->rect = params->rect;
+
+        if (alloc == NULL) {
+                kfbbm->alloc.pitch = dim.x * sizeof(uint32_t);
+                kfbbm->alloc.off0 = 0;
+                kfbbm->alloc.pixels = malloc(kfbbm->alloc.pitch * dim.y);
+                kfbbm->myalloc = true;
+
+                if (kfbbm->alloc.pixels == NULL) {
+                        rc = ENOMEM;
+                        goto error;
                 }
         } else {
-                for (sysarg_t y = y0; y < height + y0; ++y) {
-                        for (sysarg_t x = x0; x < width + x0; ++x) {
-                                kfb.pixel2visual(kfb.addr + FB_POS(x, y),
-                                    *pixelmap_pixel_at(map,
-                                    (x + x_offset) % map->width,
-                                    (y + y_offset) % map->height));
-                        }
+                kfbbm->alloc = *alloc;
+        }
+
+        kfbbm->kfb = kfb;
+        *rbm = (void *)kfbbm;
+        return EOK;
+error:
+        if (rbm != NULL)
+                free(kfbbm);
+        return rc;
+}
+
+/** Destroy bitmap in KFB GC.
+ *
+ * @param bm Bitmap
+ * @return EOK on success or an error code
+ */
+static errno_t kfb_gc_bitmap_destroy(void *bm)
+{
+        kfb_bitmap_t *kfbbm = (kfb_bitmap_t *)bm;
+        if (kfbbm->myalloc)
+                free(kfbbm->alloc.pixels);
+        free(kfbbm);
+        return EOK;
+}
+
+/** Render bitmap in KFB GC.
+ *
+ * @param bm Bitmap
+ * @param srect0 Source rectangle or @c NULL
+ * @param offs0 Offset or @c NULL
+ * @return EOK on success or an error code
+ */
+static errno_t kfb_gc_bitmap_render(void *bm, gfx_rect_t *srect0,
+    gfx_coord2_t *offs0)
+{
+        kfb_bitmap_t *kfbbm = (kfb_bitmap_t *)bm;
+        kfb_t *kfb = kfbbm->kfb;
+        gfx_rect_t srect;
+        gfx_rect_t drect;
+        gfx_coord2_t offs;
+        gfx_coord2_t bmdim;
+        gfx_coord2_t dim;
+        gfx_coord_t x, y;
+        pixelmap_t pbm;
+        pixel_t color;
+
+        if (srect0 != NULL)
+                srect = *srect0;
+        else
+                srect = kfbbm->rect;
+
+        if (offs0 != NULL) {
+                offs = *offs0;
+        } else {
+                offs.x = 0;
+                offs.y = 0;
+        }
+
+        /* Destination rectangle */
+        gfx_rect_translate(&offs, &srect, &drect);
+        gfx_coord2_subtract(&drect.p1, &drect.p0, &dim);
+        gfx_coord2_subtract(&kfbbm->rect.p1, &kfbbm->rect.p0, &bmdim);
+
+        pbm.width = bmdim.x;
+        pbm.height = bmdim.y;
+        pbm.data = kfbbm->alloc.pixels;
+
+        for (y = srect.p0.y; y < srect.p1.y; y++) {
+                for (x = srect.p0.x; x < srect.p1.x; x++) {
+                        color = pixelmap_get_pixel(&pbm, x, y);
+                        kfb->pixel2visual(kfb->addr +
+                            FB_POS(kfb, x, y), color);
                 }
         }
@@ -137 +281 @@
 }
 
-static errno_t kfb_change_mode(visualizer_t *vs, vslmode_t new_mode)
-{
-        vs->ops.handle_damage = kfb_handle_damage_pixels;
-        return EOK;
-}
-
-static errno_t kfb_suspend(visualizer_t *vs)
-{
-        return EOK;
-}
-
-static errno_t kfb_wakeup(visualizer_t *vs)
-{
-        return EOK;
-}
-
-static visualizer_ops_t kfb_ops = {
-        .claim = kfb_claim,
-        .yield = kfb_yield,
-        .change_mode = kfb_change_mode,
-        .handle_damage = NULL,
-        .suspend = kfb_suspend,
-        .wakeup = kfb_wakeup
-};
-
-static void graph_vsl_connection(ipc_call_t *icall, void *arg)
-{
-        visualizer_t *vsl;
+/** Get allocation info for bitmap in KFB GC.
+ *
+ * @param bm Bitmap
+ * @param alloc Place to store allocation info
+ * @return EOK on success or an error code
+ */
+static errno_t kfb_gc_bitmap_get_alloc(void *bm, gfx_bitmap_alloc_t *alloc)
+{
+        kfb_bitmap_t *kfbbm = (kfb_bitmap_t *)bm;
+        *alloc = kfbbm->alloc;
+        return EOK;
+}
+
+#include <stdio.h>
+static void kfb_client_conn(ipc_call_t *icall, void *arg)
+{
+        kfb_t *kfb;
+        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);
-
-        if (kfb.addr != NULL) {
-                rc = physmem_unmap(kfb.addr);
+        kfb = (kfb_t *) ddf_fun_data_get((ddf_fun_t *) arg);
+
+        printf("kfb_client_conn arg2=%lu arg3=%lu arg4=%lu\n",
+            ipc_get_arg2(icall), ipc_get_arg3(icall), ipc_get_arg4(icall));
+        gc_id = ipc_get_arg3(icall);
+
+        if (gc_id == 0) {
+                /* Set up protocol structure */
+                ddev_srv_initialize(&srv);
+                srv.ops = &kfb_ddev_ops;
+                srv.arg = kfb;
+
+                /* Handle connection */
+                ddev_conn(icall, &srv);
+        } else {
+                assert(gc_id == 42);
+
+                rc = physmem_map(kfb->paddr + kfb->offset,
+                    ALIGN_UP(kfb->size, PAGE_SIZE) >> PAGE_WIDTH,
+                    AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb->addr);
+                if (rc != EOK)
+                        goto error;
+
+                rc = gfx_context_new(&kfb_gc_ops, kfb, &gc);
+                if (rc != EOK)
+                        goto error;
+
+                /* GC connection */
+                gc_conn(icall, gc);
+
+                rc = physmem_unmap(kfb->addr);
                 if (rc == EOK)
-                        kfb.addr = NULL;
-        }
+                        kfb->addr = NULL;
+        }
+
+        return;
+error:
+        if (kfb->addr != NULL) {
+                if (physmem_unmap(kfb->addr) == EOK)
+                        kfb->addr = NULL;
+        }
+
+        async_answer_0(icall, rc);
 }
 
 errno_t port_init(ddf_dev_t *dev)
 {
+        ddf_fun_t *fun = NULL;
+        kfb_t *kfb = NULL;
+        errno_t rc;
+
+        fun = ddf_fun_create(dev, fun_exposed, "kfb");
+        if (fun == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        ddf_fun_set_conn_handler(fun, &kfb_client_conn);
+
+        kfb = ddf_fun_data_alloc(fun, sizeof(kfb_t));
+        if (kfb == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
         sysarg_t present;
-        errno_t rc = sysinfo_get_value("fb", &present);
+        rc = sysinfo_get_value("fb", &present);
         if (rc != EOK)
                 present = false;
 
-        if (!present)
-                return ENOENT;
+        if (!present) {
+                ddf_fun_destroy(fun);
+                rc = ENOENT;
+                goto error;
+        }
 
         sysarg_t kind;
@@ -192 +384 @@
                 kind = (sysarg_t) -1;
 
-        if (kind != 1)
-                return EINVAL;
+        if (kind != 1) {
+                rc = EINVAL;
+                goto error;
+        }
 
         sysarg_t paddr;
         rc = sysinfo_get_value("fb.address.physical", &paddr);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         sysarg_t offset;
@@ -208 +402 @@
         rc = sysinfo_get_value("fb.width", &width);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         sysarg_t height;
         rc = sysinfo_get_value("fb.height", &height);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         sysarg_t scanline;
         rc = sysinfo_get_value("fb.scanline", &scanline);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         sysarg_t visual;
         rc = sysinfo_get_value("fb.visual", &visual);
         if (rc != EOK)
-                return rc;
-
-        kfb.width = width;
-        kfb.height = height;
-        kfb.paddr = paddr;
-        kfb.offset = offset;
-        kfb.scanline = scanline;
-        kfb.visual = visual;
+                goto error;
+
+        kfb->fun = fun;
+
+        kfb->width = width;
+        kfb->height = height;
+        kfb->paddr = paddr;
+        kfb->offset = offset;
+        kfb->scanline = scanline;
+        kfb->visual = visual;
 
         switch (visual) {
         case VISUAL_INDIRECT_8:
-                kfb.pixel2visual = pixel2bgr_323;
-                kfb.visual2pixel = bgr_323_2pixel;
-                kfb.visual_mask = visual_mask_323;
-                kfb.pixel_bytes = 1;
+                kfb->pixel2visual = pixel2bgr_323;
+                kfb->visual2pixel = bgr_323_2pixel;
+                kfb->visual_mask = visual_mask_323;
+                kfb->pixel_bytes = 1;
                 break;
         case VISUAL_RGB_5_5_5_LE:
-                kfb.pixel2visual = pixel2rgb_555_le;
-                kfb.visual2pixel = rgb_555_le_2pixel;
-                kfb.visual_mask = visual_mask_555;
-                kfb.pixel_bytes = 2;
+                kfb->pixel2visual = pixel2rgb_555_le;
+                kfb->visual2pixel = rgb_555_le_2pixel;
+                kfb->visual_mask = visual_mask_555;
+                kfb->pixel_bytes = 2;
                 break;
         case VISUAL_RGB_5_5_5_BE:
-                kfb.pixel2visual = pixel2rgb_555_be;
-                kfb.visual2pixel = rgb_555_be_2pixel;
-                kfb.visual_mask = visual_mask_555;
-                kfb.pixel_bytes = 2;
+                kfb->pixel2visual = pixel2rgb_555_be;
+                kfb->visual2pixel = rgb_555_be_2pixel;
+                kfb->visual_mask = visual_mask_555;
+                kfb->pixel_bytes = 2;
                 break;
         case VISUAL_RGB_5_6_5_LE:
-                kfb.pixel2visual = pixel2rgb_565_le;
-                kfb.visual2pixel = rgb_565_le_2pixel;
-                kfb.visual_mask = visual_mask_565;
-                kfb.pixel_bytes = 2;
+                kfb->pixel2visual = pixel2rgb_565_le;
+                kfb->visual2pixel = rgb_565_le_2pixel;
+                kfb->visual_mask = visual_mask_565;
+                kfb->pixel_bytes = 2;
                 break;
         case VISUAL_RGB_5_6_5_BE:
-                kfb.pixel2visual = pixel2rgb_565_be;
-                kfb.visual2pixel = rgb_565_be_2pixel;
-                kfb.visual_mask = visual_mask_565;
-                kfb.pixel_bytes = 2;
+                kfb->pixel2visual = pixel2rgb_565_be;
+                kfb->visual2pixel = rgb_565_be_2pixel;
+                kfb->visual_mask = visual_mask_565;
+                kfb->pixel_bytes = 2;
                 break;
         case VISUAL_RGB_8_8_8:
-                kfb.pixel2visual = pixel2rgb_888;
-                kfb.visual2pixel = rgb_888_2pixel;
-                kfb.visual_mask = visual_mask_888;
-                kfb.pixel_bytes = 3;
+                kfb->pixel2visual = pixel2rgb_888;
+                kfb->visual2pixel = rgb_888_2pixel;
+                kfb->visual_mask = visual_mask_888;
+                kfb->pixel_bytes = 3;
                 break;
         case VISUAL_BGR_8_8_8:
-                kfb.pixel2visual = pixel2bgr_888;
-                kfb.visual2pixel = bgr_888_2pixel;
-                kfb.visual_mask = visual_mask_888;
-                kfb.pixel_bytes = 3;
+                kfb->pixel2visual = pixel2bgr_888;
+                kfb->visual2pixel = bgr_888_2pixel;
+                kfb->visual_mask = visual_mask_888;
+                kfb->pixel_bytes = 3;
                 break;
         case VISUAL_RGB_8_8_8_0:
-                kfb.pixel2visual = pixel2rgb_8880;
-                kfb.visual2pixel = rgb_8880_2pixel;
-                kfb.visual_mask = visual_mask_8880;
-                kfb.pixel_bytes = 4;
+                kfb->pixel2visual = pixel2rgb_8880;
+                kfb->visual2pixel = rgb_8880_2pixel;
+                kfb->visual_mask = visual_mask_8880;
+                kfb->pixel_bytes = 4;
                 break;
         case VISUAL_RGB_0_8_8_8:
-                kfb.pixel2visual = pixel2rgb_0888;
-                kfb.visual2pixel = rgb_0888_2pixel;
-                kfb.visual_mask = visual_mask_0888;
-                kfb.pixel_bytes = 4;
+                kfb->pixel2visual = pixel2rgb_0888;
+                kfb->visual2pixel = rgb_0888_2pixel;
+                kfb->visual_mask = visual_mask_0888;
+                kfb->pixel_bytes = 4;
                 break;
         case VISUAL_BGR_0_8_8_8:
-                kfb.pixel2visual = pixel2bgr_0888;
-                kfb.visual2pixel = bgr_0888_2pixel;
-                kfb.visual_mask = visual_mask_0888;
-                kfb.pixel_bytes = 4;
+                kfb->pixel2visual = pixel2bgr_0888;
+                kfb->visual2pixel = bgr_0888_2pixel;
+                kfb->visual_mask = visual_mask_0888;
+                kfb->pixel_bytes = 4;
                 break;
         case VISUAL_BGR_8_8_8_0:
-                kfb.pixel2visual = pixel2bgr_8880;
-                kfb.visual2pixel = bgr_8880_2pixel;
-                kfb.visual_mask = visual_mask_8880;
-                kfb.pixel_bytes = 4;
+                kfb->pixel2visual = pixel2bgr_8880;
+                kfb->visual2pixel = bgr_8880_2pixel;
+                kfb->visual_mask = visual_mask_8880;
+                kfb->pixel_bytes = 4;
                 break;
         default:
@@ -303 +499 @@
         }
 
-        kfb.size = scanline * height;
-        kfb.addr = AS_AREA_ANY;
-
-        ddf_fun_t *fun_vs = ddf_fun_create(dev, fun_exposed, "vsl0");
-        if (fun_vs == NULL) {
-                as_area_destroy(kfb.addr);
-                return ENOMEM;
-        }
-        ddf_fun_set_conn_handler(fun_vs, &graph_vsl_connection);
-
-        visualizer_t *vs = ddf_fun_data_alloc(fun_vs, sizeof(visualizer_t));
-        if (vs == NULL) {
-                as_area_destroy(kfb.addr);
-                return ENOMEM;
-        }
-        graph_init_visualizer(vs);
-
-        pixel_mode.mode.index = 0;
-        pixel_mode.mode.version = 0;
-        pixel_mode.mode.refresh_rate = 0;
-        pixel_mode.mode.screen_aspect.width = width;
-        pixel_mode.mode.screen_aspect.height = height;
-        pixel_mode.mode.screen_width = width;
-        pixel_mode.mode.screen_height = height;
-        pixel_mode.mode.cell_aspect.width = 1;
-        pixel_mode.mode.cell_aspect.height = 1;
-        pixel_mode.mode.cell_visual.pixel_visual = visual;
-
-        link_initialize(&pixel_mode.link);
-        list_append(&pixel_mode.link, &vs->modes);
-
-        vs->def_mode_idx = 0;
-
-        vs->ops = kfb_ops;
-        vs->dev_ctx = NULL;
-
-        rc = ddf_fun_bind(fun_vs);
+        kfb->size = scanline * height;
+        kfb->addr = AS_AREA_ANY;
+
+        rc = ddf_fun_bind(fun);
+        if (rc != EOK)
+                goto error;
+
+        rc = ddf_fun_add_to_category(fun, "display-device");
         if (rc != EOK) {
-                list_remove(&pixel_mode.link);
-                ddf_fun_destroy(fun_vs);
-                as_area_destroy(kfb.addr);
-                return rc;
-        }
-
-        vs->reg_svc_handle = ddf_fun_get_handle(fun_vs);
-        rc = ddf_fun_add_to_category(fun_vs, "visualizer");
-        if (rc != EOK) {
-                list_remove(&pixel_mode.link);
-                ddf_fun_unbind(fun_vs);
-                ddf_fun_destroy(fun_vs);
-                as_area_destroy(kfb.addr);
-                return rc;
-        }
-
-        return EOK;
+                ddf_fun_unbind(fun);
+                goto error;
+        }
+
+        return EOK;
+error:
+        if (fun != NULL)
+                ddf_fun_destroy(fun);
+        return rc;
 }
 

uspace/lib/ddev/include/ddev_srv.h

@@ -50 +50 @@
 
 struct ddev_ops {
-        errno_t (*get_gc)(void *, gfx_context_t **);
+        errno_t (*get_gc)(void *, sysarg_t *, sysarg_t *);
 };
 

uspace/lib/ddev/src/ddev.c

@@ -88 +88 @@
         async_sess_t *sess;
         async_exch_t *exch;
+        sysarg_t arg2;
+        sysarg_t arg3;
         ipc_gc_t *gc;
         errno_t rc;
 
         exch = async_exchange_begin(ddev->sess);
-        sess = async_connect_me_to(exch, INTERFACE_GC, 0, 42);
-        if (sess == NULL) {
-                async_exchange_end(exch);
+        rc = async_req_0_2(exch, DDEV_GET_GC, &arg2, &arg3);
+        sess = async_connect_me_to(exch, INTERFACE_GC, arg2, arg3);
+        async_exchange_end(exch);
+
+        if (sess == NULL)
                 return EIO;
-        }
-
-        async_exchange_end(exch);
 
         rc = ipc_gc_create(sess, &gc);

uspace/lib/ddev/src/ddev_srv.c

@@ -45 +45 @@
 #include <stdio.h>
 
+/** Connect to a GC.
+ *
+ * XXX As a workaround here we tell the client the values of arg2 and arg3
+ * needed to connect to the GC using async_connect_me_to(), these need
+ * to be provided by the ddev_ops_t.get_gc. Different values are needed
+ * for a DDF driver or a regular server. This would not be needed if we
+ * had a proper way of creating an endpoint and passing it to our client.
+ */
+static void ddev_get_gc_srv(ddev_srv_t *srv, ipc_call_t *icall)
+{
+        sysarg_t arg2;
+        sysarg_t arg3;
+        errno_t rc;
+
+        printf("ddev_get_gc_srv\n");
+
+        if (srv->ops->get_gc == NULL) {
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        rc = srv->ops->get_gc(srv->arg, &arg2, &arg3);
+        async_answer_2(icall, rc, arg2, arg3);
+}
+
 void ddev_conn(ipc_call_t *icall, ddev_srv_t *srv)
 {
         /* Accept the connection */
         async_accept_0(icall);
-        printf("display_conn\n");
+        printf("ddev_conn\n");
 
         while (true) {
@@ -66 +91 @@
                 switch (method) {
                 case DDEV_GET_GC:
+                        ddev_get_gc_srv(srv, &call);
+                        break;
                 default:
                         async_answer_0(&call, ENOTSUP);

uspace/lib/ddev/test/ddev.c

@@ -48 +48 @@
 static void test_ddev_conn(ipc_call_t *, void *);
 
-static errno_t test_get_gc(void *, gfx_context_t **);
+static errno_t test_get_gc(void *, sysarg_t *, sysarg_t *);
 static errno_t test_gc_set_color(void *, gfx_color_t *);
 
@@ -215 +215 @@
 }
 
-static errno_t test_get_gc(void *arg, gfx_context_t **rgc)
-{
-        *rgc = NULL;
-        return ENOTSUP;
+static errno_t test_get_gc(void *arg, sysarg_t *arg2, sysarg_t *arg3)
+{
+        *arg2 = 0;
+        *arg3 = 42;
+        return EOK;
 }
 

uspace/srv/hid/rfb/main.c

@@ -69 +69 @@
 } rfb_bitmap_t;
 
-gfx_context_ops_t rfb_gc_ops = {
+static gfx_context_ops_t rfb_gc_ops = {
         .set_color = rfb_gc_set_color,
         .fill_rect = rfb_gc_fill_rect,
@@ -277 +277 @@
 }
 
-#if 0
-static errno_t rfb_handle_damage_pixels(visualizer_t *vs,
-    sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
-    sysarg_t x_offset, sysarg_t y_offset)
-{
-        fibril_mutex_lock(&rfb.lock);
-
-        if (x0 + width > rfb.width || y0 + height > rfb.height) {
-                fibril_mutex_unlock(&rfb.lock);
-                return EINVAL;
-        }
-
-        /* TODO update surface_t and use it */
-        if (!rfb.damage_valid) {
-                rfb.damage_rect.x = x0;
-                rfb.damage_rect.y = y0;
-                rfb.damage_rect.width = width;
-                rfb.damage_rect.height = height;
-                rfb.damage_valid = true;
-        } else {
-                if (x0 < rfb.damage_rect.x) {
-                        rfb.damage_rect.width += rfb.damage_rect.x - x0;
-                        rfb.damage_rect.x = x0;
-                }
-                if (y0 < rfb.damage_rect.y) {
-                        rfb.damage_rect.height += rfb.damage_rect.y - y0;
-                        rfb.damage_rect.y = y0;
-                }
-                sysarg_t x1 = x0 + width;
-                sysarg_t dx1 = rfb.damage_rect.x + rfb.damage_rect.width;
-                if (x1 > dx1) {
-                        rfb.damage_rect.width += x1 - dx1;
-                }
-                sysarg_t y1 = y0 + height;
-                sysarg_t dy1 = rfb.damage_rect.y + rfb.damage_rect.height;
-                if (y1 > dy1) {
-                        rfb.damage_rect.height += y1 - dy1;
-                }
-        }
-
-        pixelmap_t *map = &vs->cells;
-
-        for (sysarg_t y = y0; y < height + y0; ++y) {
-                for (sysarg_t x = x0; x < width + x0; ++x) {
-                        pixel_t pix = pixelmap_get_pixel(map, (x + x_offset) % map->width,
-                            (y + y_offset) % map->height);
-                        pixelmap_put_pixel(&rfb.framebuffer, x, y, pix);
-                }
-        }
-
-        fibril_mutex_unlock(&rfb.lock);
-        return EOK;
-}
-#endif
-
 static void syntax_print(void)
 {