Changeset 3f03199 in mainline for uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (1 diff)

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -273 +273 @@
         ddf_log_note("Setting mode: %ux%ux%u\n", x, y, bpp*8);
         const size_t size = ALIGN_UP(x * y * bpp, PAGE_SIZE);
-        void *buffer, *pa;
-        int ret = dmamem_map_anonymous(size, AS_AREA_READ | AS_AREA_WRITE,
-            0, &pa, &buffer);
+        uintptr_t pa;
+        void *buffer;
+        int ret = dmamem_map_anonymous(size, DMAMEM_4GiB,
+            AS_AREA_READ | AS_AREA_WRITE, 0, &pa, &buffer);
         if (ret != EOK) {
                 ddf_log_error("Failed to get new FB\n");
                 return ret;
         }
+        
         amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp *8, (uint32_t)pa);
         dispc->active_fb.idx = mode.index;