Changeset f03f107 in mainline

Timestamp:

2013-01-20T22:40:05Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

943a1dc6

Parents:

7fa2031

Message:

amdm37x_dispc: Implement damage_handling.

Copied over from kfb.

Location:

uspace/drv/fb/amdm37x_dispc

Files:

• amdm37x_dispc.c (modified) (4 diffs)
• amdm37x_dispc.h (modified) (2 diffs)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -244 +244 @@
 }
 
-static int handle_damage(visualizer_t *vs,
-    sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
-    sysarg_t x_offset, sysarg_t y_offset)
-{
-        ddf_log_fatal("Handling damage\n");
-        return EOK;
-}
-
 static int change_mode(visualizer_t *vis, vslmode_t mode)
 {
@@ -258 +250 @@
 
         amdm37x_dispc_t *dispc = vis->dev_ctx;
-        const unsigned bpp = visual2bpp(mode.cell_visual.pixel_visual);
+        const visual_t visual = mode.cell_visual.pixel_visual;
+        const unsigned bpp = visual2bpp(visual);
         const unsigned x = mode.screen_width;
         const unsigned y = mode.screen_height;
@@ -271 +264 @@
         }
         amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp, (uint32_t)pa);
+        dispc->active_fb.idx = mode.index;
+        dispc->active_fb.width = x;
+        dispc->active_fb.height = y;
+        dispc->active_fb.pitch = 0;
+        dispc->active_fb.bpp = bpp;
+        assert(mode.index < 1);
 
         if (dispc->fb_data)
@@ -276 +275 @@
         return EOK;
 }
+
+static int handle_damage(visualizer_t *vs,
+    sysarg_t x0, sysarg_t y0, sysarg_t width, sysarg_t height,
+    sysarg_t x_offset, sysarg_t y_offset)
+{
+        assert(vs);
+        assert(vs->dev_ctx);
+        amdm37x_dispc_t *dispc = vs->dev_ctx;
+        pixelmap_t *map = &vs->cells;
+
+#define FB_POS(x, y) \
+        (((y) * (dispc->active_fb.width + dispc->active_fb.pitch) + (x)) \
+            * dispc->active_fb.bpp)
+        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) {
+                                dispc->pixel2visual(
+                                    dispc->fb_data + FB_POS(x, y), *pixel++);
+                        }
+                }
+        } else {
+                for (sysarg_t y = y0; y < height + y0; ++y) {
+                        for (sysarg_t x = x0; x < width + x0; ++x) {
+                                dispc->pixel2visual(
+                                    dispc->fb_data + FB_POS(x, y),
+                                    *pixelmap_pixel_at(map,
+                                        (x + x_offset) % map->width,
+                                        (y + y_offset) % map->height));
+                        }
+                }
+        }
+
+        ddf_log_note("Handling damage\n");
+        return EOK;
+}
+

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.h

@@ -46 +46 @@
         amdm37x_dispc_regs_t *regs;
 
-        unsigned fb_width;
-        unsigned fb_height;
         unsigned offset;
-        unsigned scanline;
         visual_t visual;
 
@@ -55 +52 @@
         visual2pixel_t visual2pixel;
         visual_mask_t visual_mask;
-        unsigned pixel_bytes;
+
+        struct {
+                unsigned width;
+                unsigned height;
+                unsigned pitch;
+                unsigned bpp;
+                unsigned idx;
+        } active_fb;
 
         size_t size;