Changeset 94e46c9 in mainline for uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

Timestamp:

2015-05-23T04:09:11Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

File:

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

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -282 +282 @@
                 return ret;
         }
+        if (dispc->fb_data)
+                dmamem_unmap_anonymous(dispc->fb_data);
         
+        dispc->fb_data = buffer;
         amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp *8, (uint32_t)pa);
         dispc->active_fb.idx = mode.index;
@@ -290 +293 @@
         dispc->active_fb.bpp = bpp;
         dispc->active_fb.pixel2visual = p2v;
-        dispc->fb_data = buffer;
         dispc->size = size;
         assert(mode.index < 1);
 
-        if (dispc->fb_data)
-                dmamem_unmap_anonymous(dispc->fb_data);
         return EOK;
 }