0000000000000000000000000000000000000000 ec4e5ed6e363b3793d8e90e6fbadd4c4ed6ded3f Denis Oliver Kropp <dok@shizo.(none)> 1184775663 +0200	branch: Created from HEAD
ec4e5ed6e363b3793d8e90e6fbadd4c4ed6ded3f 5122eb2c55ef949640bd967a48eea34009bfb3d4 Denis Oliver Kropp <dok@shizo.(none)> 1184775672 +0200	commit: LOCAL HACKS
5122eb2c55ef949640bd967a48eea34009bfb3d4 d0356880cd2ab0bdb77240067a3d0714a723440f Denis Oliver Kropp <dok@shizo.(none)> 1184783820 +0200	cherry-pick: Raise max number of shm pools to 16.
d0356880cd2ab0bdb77240067a3d0714a723440f bb8c42356ba2e61a5ce821dbb42370e156dc5605 Denis Oliver Kropp <dok@shizo.(none)> 1184783820 +0200	cherry-pick: Added debug messages.
bb8c42356ba2e61a5ce821dbb42370e156dc5605 1d6e782c4cc4836d0485000ffd3e3b65788cf92c Denis Oliver Kropp <dok@shizo.(none)> 1184786180 +0200	commit: Few more debug messages.
1d6e782c4cc4836d0485000ffd3e3b65788cf92c ff18e6dc9b74142b6a22c4c48c430776776d9fc6 Denis Oliver Kropp <dok@shizo.(none)> 1185189598 +0200	commit: Added source color keying and destination color key protection in 16 bit scaling template.
ff18e6dc9b74142b6a22c4c48c430776776d9fc6 1070116a65b3197de172e5e3f351f93538b699f4 Denis Oliver Kropp <dok@shizo.(none)> 1185189617 +0200	commit: Fix warnings.
1070116a65b3197de172e5e3f351f93538b699f4 f4d15b78f827651d2806cc9aa14dc72dd77f5657 Denis Oliver Kropp <dok@shizo.(none)> 1185189752 +0200	commit: Don't bail out with other system modules if LINUX_INPUT_USE_FBDEV is not set.
f4d15b78f827651d2806cc9aa14dc72dd77f5657 9f6ec9b5cc0537cfbcaa09ad79710ab87a1be5f4 Denis Oliver Kropp <dok@shizo.(none)> 1185357112 +0200	commit: Added option "layer-src-key-index".
9f6ec9b5cc0537cfbcaa09ad79710ab87a1be5f4 4a3f0ee7028231e99c6e9d596e2aba0aebdd7486 Denis Oliver Kropp <dok@shizo.zion.home> 1185520468 +0200	cherry-pick: Added copyright footer.
4a3f0ee7028231e99c6e9d596e2aba0aebdd7486 9d8f50f15d58205fffc028f4af145ab53dad2699 Denis Oliver Kropp <dok@shizo.zion.home> 1185520477 +0200	cherry-pick: Follow DFBColorKey change in layer API.
9d8f50f15d58205fffc028f4af145ab53dad2699 52a50a6ae7b7a29d2a35dbce60da6a9fea87f6ce Denis Oliver Kropp <dok@shizo.zion.home> 1185520485 +0200	cherry-pick: Fixed warnings.
52a50a6ae7b7a29d2a35dbce60da6a9fea87f6ce 84df1a39503b7a2ed4be2ad178bcf25a085658ca Denis Oliver Kropp <dok@shizo.zion.home> 1187173637 +0200	cherry-pick: Fixed different bugs/crashes in the scaling code.
84df1a39503b7a2ed4be2ad178bcf25a085658ca 7e0beab8b5e78d5cbf70727d2cde04f3c406e753 Denis Oliver Kropp <dok@shizo.zion.home> 1187173637 +0200	cherry-pick: Readded "%.nm" as an alternative to "nm-n.%".
7e0beab8b5e78d5cbf70727d2cde04f3c406e753 d0f78daf4bab2b443dff50d138b3b8f095fe79f9 Denis Oliver Kropp <dok@shizo.zion.home> 1187173637 +0200	cherry-pick: Print an error and return if no layers are available.
d0f78daf4bab2b443dff50d138b3b8f095fe79f9 a936de8436e6a01247057476c2b2ded34c01fd45 Denis Oliver Kropp <dok@shizo.zion.home> 1187173637 +0200	cherry-pick: Added generic /dev/mem based system module.
a936de8436e6a01247057476c2b2ded34c01fd45 c57f3fda641799e9371c5cb3ab0500a61142294a Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Added dfb_pixel_to_color( format, pixel, ret_color ) using proper expansion.
c57f3fda641799e9371c5cb3ab0500a61142294a fe57955eee67a775b2e8dabe7d96eb6fdaa6084d Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Changed DirectHash's u32 key to be unsigned long. This allows to use pointers.
fe57955eee67a775b2e8dabe7d96eb6fdaa6084d 31164cb688088ff2b319c834590f1f8590ee074b Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Added direct_serial_check() returning true if the target serial is not higher.
31164cb688088ff2b319c834590f1f8590ee074b 2ce00b0047758b34c6cb68977be40294f5e285a3 Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Follow API change in DirectHash.
2ce00b0047758b34c6cb68977be40294f5e285a3 1e2d347fe25f8d8d1a4ef0552a70a3894e2de01b Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Removed volatile keyword from structures.
1e2d347fe25f8d8d1a4ef0552a70a3894e2de01b dc4231fd91302ca224b173ba3ca7c24efe7d0882 Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Fix size_t/sizeof format correctly with "%zu".
dc4231fd91302ca224b173ba3ca7c24efe7d0882 eb96c3d84711deda4b18cd70793cfccaf21bd8a2 Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Fix size_t printf format.
eb96c3d84711deda4b18cd70793cfccaf21bd8a2 cb858791928f56d57d44d1d48360d47204555691 Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Fix lock order in fusion_shm_pool_destroy().
cb858791928f56d57d44d1d48360d47204555691 62b0828d3eed1e82940a4489b5ba6724b0f9e1eb Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Added fusion_reactor_set_lock_only() which does not lock and
62b0828d3eed1e82940a4489b5ba6724b0f9e1eb e30b9f6684fb6e1320e1fd63b8f607c99140bb1c Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Fix potential dead lock in layer context initialization.
e30b9f6684fb6e1320e1fd63b8f607c99140bb1c 4334b4512b136d92bfd2914c74aebb8ee45a2ef1 Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Fix potential dead lock in dfb_layer_context_get_primary_region().
4334b4512b136d92bfd2914c74aebb8ee45a2ef1 e8bce2782f2f6e2e148cb072502194e8e778b366 Denis Oliver Kropp <dok@shizo.zion.home> 1187173638 +0200	cherry-pick: Hotfix single app build.
e8bce2782f2f6e2e148cb072502194e8e778b366 676392b7627d5ebffa2674adfea214906c6c0f09 Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: MERGE of branch surface_core into master!
676392b7627d5ebffa2674adfea214906c6c0f09 a875289c2fc86ee6faa185d2ae99af14d55a4919 Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Fix includes.
a875289c2fc86ee6faa185d2ae99af14d55a4919 d35cc32cf484110587b0077f45604bcf6d84606f Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Negotiation prefers up to date buffers, e.g. do not update
d35cc32cf484110587b0077f45604bcf6d84606f ffd314da3cc9aa102c87a6e491541c21d308903e Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Revived DSCAPS_STATIC_ALLOC, but not tested.
ffd314da3cc9aa102c87a6e491541c21d308903e 215c93f1dac75b5026c1b895b9ec46ac90b15cb7 Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Disable SDL backend by default, enable X11 backend by default.
215c93f1dac75b5026c1b895b9ec46ac90b15cb7 878b9ae6381e7f8538e690ea5092a33351cb77ed Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Fix 64bit implementations of RGB32 source and destination color keying.
878b9ae6381e7f8538e690ea5092a33351cb77ed 2db89ce1a427747a7a08ed2b38f08f1ae6ced451 Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Fix transfer of errno from master to slaves when doing ioctls.
2db89ce1a427747a7a08ed2b38f08f1ae6ced451 357e62d724d3b90354f315221c1c255f260a6fd5 Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Do FBIOPAN_DISPLAY ioctls directly.
357e62d724d3b90354f315221c1c255f260a6fd5 4c73856b0679ae27c39ac6acaf0df11074503348 Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Added universal resource id (unsigned long) that belongs to each surface,
4c73856b0679ae27c39ac6acaf0df11074503348 e900e606c63d6d0bca1e4fc20961498c014b2c19 Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Rearrange locks to avoid dead locks in certain circumstances.
e900e606c63d6d0bca1e4fc20961498c014b2c19 fbbbf0de7e216c173d0227e02531ce0c9723b25e Denis Oliver Kropp <dok@shizo.zion.home> 1187173639 +0200	cherry-pick: Fusion 7.0: Messages are aligned on a 4 byte boundary now.
fbbbf0de7e216c173d0227e02531ce0c9723b25e 1cf247a264c8e8e8b137e3c2fe6fde77ba5e9eff Denis Oliver Kropp <dok@shizo.zion.home> 1187173640 +0200	cherry-pick: Port matrox to the new surface core.
1cf247a264c8e8e8b137e3c2fe6fde77ba5e9eff 0585c93623725f4e402f7b1b8307bdf5005259ee Denis Oliver Kropp <dok@shizo.zion.home> 1187173640 +0200	cherry-pick: Port mach64 to the new surface core.
0585c93623725f4e402f7b1b8307bdf5005259ee ff26b7c7c50b9891ce736e2bdd12fd5a65873174 Denis Oliver Kropp <dok@shizo.zion.home> 1187173640 +0200	cherry-pick: Reset besvcnt to 0 prior to disabling the backend scaler.
ff26b7c7c50b9891ce736e2bdd12fd5a65873174 176997f93e0743b59198478f0d970c1c92065cac Denis Oliver Kropp <dok@shizo.zion.home> 1187173640 +0200	cherry-pick: Silence some automake warnings.
176997f93e0743b59198478f0d970c1c92065cac b5c28a151a5eb8692d208476fc441888c0ca5458 Denis Oliver Kropp <dok@shizo.zion.home> 1187173640 +0200	cherry-pick: Fix potential SEGV in linux_input
b5c28a151a5eb8692d208476fc441888c0ca5458 017544d3d9a7f133fa1f2dd1d9db56d2b4c33790 Denis Oliver Kropp <dok@shizo.zion.home> 1187184012 +0200	cherry-pick: Format fixes in Voodoo.
017544d3d9a7f133fa1f2dd1d9db56d2b4c33790 b8f95d8fe9058965d60a9e1031d750c318c60588 Denis Oliver Kropp <dok@shizo.zion.home> 1187184012 +0200	cherry-pick: Calculate binary version from micro-binary age.
b8f95d8fe9058965d60a9e1031d750c318c60588 983efc9d3eff21d81484d8e2844ce249facf4368 Denis Oliver Kropp <dok@shizo.zion.home> 1187184012 +0200	cherry-pick: Fix warnings.
983efc9d3eff21d81484d8e2844ce249facf4368 93331c24f9b4b40cebff662753b805a13edc6356 Denis Oliver Kropp <dok@shizo.zion.home> 1187184012 +0200	cherry-pick: Fix warnings and indention.
93331c24f9b4b40cebff662753b805a13edc6356 c256be075e44fe434356c817ec12dd157bcf9694 Denis Oliver Kropp <dok@shizo.zion.home> 1187184012 +0200	cherry-pick: Fixed unitialized values in scaling code.
c256be075e44fe434356c817ec12dd157bcf9694 bff3affdcc85a5b22390665176b8635ece20b03e Denis Oliver Kropp <dok@shizo.zion.home> 1187184012 +0200	cherry-pick: Fixed uninitialized result in dfb_fbdev_pan().
bff3affdcc85a5b22390665176b8635ece20b03e e37f9bfb163eff3c63dcd71fb1b23fc36015b3cd Denis Oliver Kropp <dok@shizo.zion.home> 1187187320 +0200	commit: Don't print any error at all if pool negotiation fails.
e37f9bfb163eff3c63dcd71fb1b23fc36015b3cd 1b10a49b57739b9999957e7edba361dcb1b925b0 Denis Oliver Kropp <dok@shizo.zion.home> 1187200467 +0200	commit: Idea is to have a Flip() with multiple regions passed in.
1b10a49b57739b9999957e7edba361dcb1b925b0 170b274450b37b7e507e6daa08b49f68f0aa2fa2 Denis Oliver Kropp <dok@shizo.zion.home> 1187200565 +0200	commit: Compatibility and warning for drivers still using state->modified.
170b274450b37b7e507e6daa08b49f68f0aa2fa2 3b6a71fd2a9816c830721cc6abd6fa4b1d37b55b Denis Oliver Kropp <dok@shizo.zion.home> 1187200593 +0200	commit: Debug and error messages for window creation.
3b6a71fd2a9816c830721cc6abd6fa4b1d37b55b 33ea1e2412f0e324d2ee30d88d8f008f009cbf06 Denis Oliver Kropp <dok@shizo.zion.home> 1187202100 +0200	revert: Revert "Fix potential dead lock in dfb_layer_context_get_primary_region()."
33ea1e2412f0e324d2ee30d88d8f008f009cbf06 3b6a71fd2a9816c830721cc6abd6fa4b1d37b55b Denis Oliver Kropp <dok@shizo.zion.home> 1187202333 +0200	reset --hard HEAD^
3b6a71fd2a9816c830721cc6abd6fa4b1d37b55b 138d1d094ff294a72eff02a4b6bdd84f15bc7537 Denis Oliver Kropp <dok@shizo.zion.home> 1187597950 +0200	commit: Use a Skirmish to synchronize slaves with the master's post core initialization.
138d1d094ff294a72eff02a4b6bdd84f15bc7537 399c79bf7fc46ef061794265256cc60fab8437f4 Denis Oliver Kropp <dok@shizo.zion.home> 1188215937 +0200	cherry-pick: Updated for 1.1.0
399c79bf7fc46ef061794265256cc60fab8437f4 74865b6d228de9657b53711da9878d5b051c3dc1 Denis Oliver Kropp <dok@shizo.zion.home> 1188215948 +0200	cherry-pick: Moved call to dfb_core_activate() after call to dfb_wm_post_init().
74865b6d228de9657b53711da9878d5b051c3dc1 ed2c663f62d10c41472f9726f3dadc012d52788e Denis Oliver Kropp <dok@shizo.zion.home> 1188215948 +0200	cherry-pick: Fixed single app core built.
ed2c663f62d10c41472f9726f3dadc012d52788e 88802fee2a557a08acad0eef3c35446b9f5b1c94 Denis Oliver Kropp <dok@shizo.zion.home> 1188215948 +0200	cherry-pick: updated
