Revert "hwc: Enable rotator during resolution change."

This reverts commit afc70cb2ffb5c261f558622f34f17a0a10f45832.

Change-Id: I39bd1deac6cca722c8a1e1e65c4d5618d6c6b073
Revert "hwc: Add support to enable CABL for video use case only"

This reverts commit 46434de8aced466df7aa89d7182c632b5f5a2bdc.

Change-Id: Iffd927ce1cb2f1a5b34ad85061bd8f0ba0a2d218
Merge caf/kk_2.7_rb1.21

Squashed commit of the following:

commit 23da663596e80830700535991132a8f8df4baf12
Merge: ba7835f 5d12eb2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 10 06:03:12 2014 -0800

    Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.027 on remote branch"

commit 5d12eb2651778c13db17cade655394b9fecda91c
Merge: ba7835f c56049b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 10 06:25:30 2014 -0700

    Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.027 on remote branch

    Change-Id: I936655462012882c7369f175c610aea777195a4c

commit ba7835f6cfdaece50aed51804c3742c8435b7715
Merge: 22c6b8e 5a6e2a1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 9 14:10:28 2014 -0800

    Merge "Merge "Merge "hwc: remove displaying unused pipe in dump if set overlay fails"""

commit 5a6e2a1ef41700eff513eebcebca977549ba07f7
Merge: 22c6b8e 6a69dbb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 8 16:19:45 2014 -0800

    Merge "Merge "hwc: remove displaying unused pipe in dump if set overlay fails""

commit 6a69dbb615f028f7978b8b26f4c38848963eb0e5
Merge: c3f2051 d640fc2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 8 06:04:27 2014 -0800

    Merge "hwc: remove displaying unused pipe in dump if set overlay fails"

commit c3f20515f7574bcbbfd9b570736e120c10a63b04
Merge: f055f71 27207c2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 7 22:25:30 2014 -0800

    Merge "hwc: Update rotator object handling in error cases"

commit f055f71eec2b514c1bdb96ca8c3521fbdc857a19
Merge: a136b59 b7b51c0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 7 22:25:30 2014 -0800

    Merge "hwc: mdpcomp: Make all pipes available if a frame fails"

commit a136b59d65cc61b62f2d1f3d158033bc5bcce6c5
Merge: 0811dcc 6923f64
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 7 07:26:57 2014 -0800

    Merge "hwc: Reset layer-to-rotator map and fences on configuration failure"

commit 27207c2c795fa8209a258dc02fc13cbd544f7a40
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Dec 11 14:36:04 2013 -0800

    hwc: Update rotator object handling in error cases

    Earlier, on configuration errors, we simply drained the fences held
    by current rotator objects and went to GPU comp. The rotator objects
    were deleted in the subsequent rounds, if they remained unused.

    If we don't use GPU comp on failure but use other strategies, then we
    need to mark the rotator objects for a display for reuse, so that
    other strategies can use them.

    Also any failure resets on overlay or rotator need to happen from
    functions that call configuration helpers rather than the  helper
    themselves. Leaving cleanup to black-box helpers is not desirable.

    Change-Id: I59b5b1bb774b82ee85a037e934c9d2d023db30af

commit b7b51c01eb7dd059481b61d654b6966713e4137a
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Aug 28 15:13:52 2013 -0700

    hwc: mdpcomp: Make all pipes available if a frame fails

    Make all pipes in overlay available, if programming a frame (list)
    fails. The failure could be due to commit failure, in which case the
    overlay itself will make pipes available.

    The failure can also be owing to lack of pipes, since we don't allow
    switching pipes across mixers any more. This is particularly a problem
    for split-panels. This fix addresses this latter case.

    Change-Id: Ieac7ae7d03e5b9a93c7245fa160c8933593c2e09

commit 6923f645105e20559b5360e8736e05abe2a62760
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Nov 26 10:48:06 2013 -0800

    hwc: Reset layer-to-rotator map and fences on configuration failure

    When a rotator or mdp configuration for a display fails, reset the
    layer-to-rotator mappings for that display and reset the release
    fences for the rotator objects used for that display.

    Note: The rotator itself is offline and not tied to any mixer. It is
    from the mappings that we deduce which rotator object was used for
    layers of which display. Also we don't delete rotator objects held
    for a specific display, since during stability runs, failures could
    repeat each round and we end up allocating and deallocating memory
    unnecessarily. The rotator objects will be deleted automatically
    when not required anymore.

    Change-Id: I9a67f02574be30be3b96b3575f60530cb1c89e10

commit 22c6b8e69a76576559c829be6f189f942ee9cd86
Merge: f2da161 5363236
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 6 18:19:40 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit 5363236ae5b8d1d7d7e8d8ab178c9c27d74097c7
Merge: f2da161 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 6 14:11:56 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit f2da161a2d34a364587cbdb31d8815d967ff7995
Merge: 050e788 397ff42
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 6 12:44:51 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit c56049b3076e48004e77325650ce0adad313056b
Merge: 84e8a0a 7120205
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 6 08:26:28 2014 -0800

    Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.026 on remote branch"

commit 7120205a1a55d6472885239d3c5804a36d883ab0
Merge: 84e8a0a 6b4d2c8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 6 08:54:14 2014 -0700

    Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.026 on remote branch

    Change-Id: I5001d712f2df8a0f5fc382b3e135d3292fe272aa

commit 397ff42b216d5963fc8b8200b5ec404c5a760036
Merge: 050e788 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 6 04:26:59 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit 050e788ef7cafceb7c3f9d671dcab8f784ff2f47
Merge: c741ab1 26208a2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 6 04:13:27 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit 26208a2a1932c39fde7a042ce42158bcc05c9e21
Merge: c741ab1 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Jan 5 23:54:21 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit c741ab19ae32f345e5bc48d123161c5268c8a8c4
Merge: 84e8a0a e15261b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Jan 5 23:40:32 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit e15261b2c2bfad88ce02da46ebd97b7c9e2eff0e
Merge: 84e8a0a 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Jan 5 19:29:14 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit 6b4d2c828bd200fb4024a1646ece6a5bb9f4797e
Merge: 2bbd1b5 13a2809
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 3 08:57:34 2014 -0800

    Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.01.007.025 on remote branch"

commit 13a280980e0feff8b631fe4d5ebd2ddd23a11cfa
Merge: 2bbd1b5 ae0de21
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 3 08:57:48 2014 -0700

    Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.01.007.025 on remote branch

    Change-Id: I6e9489fc3d7f898446ca3a1850148a9cae087438

commit 84e8a0a6f37dbb41a93fad873e2b7316e445c6ec
Merge: e1d9a6c 228b46f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 3 07:48:42 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit 228b46f786eca1a0528eef4b434b419dac4a411d
Merge: e1d9a6c 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 3 02:57:33 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit e1d9a6ce94ade4307ea1ff1abe426261c7b1009b
Merge: 2bbd1b5 eba0a20
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 3 02:39:04 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit eba0a205966d2db5e6c461e734a47b738d1ec778
Merge: 2bbd1b5 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 2 22:04:33 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit 2bbd1b5dcb8de2c7a818a794e200208c337e6c91
Merge: d22fb51 5c53981
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 2 06:00:04 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit 5c539816016226a02de917e86bb15becb1731408
Merge: d22fb51 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 2 01:59:03 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit d22fb5154ba4c444acf3d28e887d777543f8b2bb
Merge: b78a7a2 0ac3736
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 2 01:43:34 2014 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit 0ac3736af292638a75b6a93efe0434fbe9d51059
Merge: b78a7a2 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 1 21:36:42 2014 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit b78a7a2f984c68bbe89e74cd4c20ca5fbf63aa74
Merge: a2786e2 0663b8a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 17:18:38 2013 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit 0663b8a7d0db32f819b48158140a37ce44b45505
Merge: a2786e2 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 13:24:32 2013 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit a2786e2303d4cb768d9812fc839e2ec9a7d6360d
Merge: 8a9d13a 702ed7e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 13:12:03 2013 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit 702ed7e245af626e9885b6bb27a4cc341759c519
Merge: 8a9d13a 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 08:54:57 2013 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit 8a9d13a8a9f176de31f89bd5b16b51bff008489b
Merge: 334f3e9 ab46ffb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 08:44:08 2013 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit ab46ffbc05fa4dbe1adc8d30c3efbee75a18d4e4
Merge: 334f3e9 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 04:43:54 2013 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit 334f3e9a5e38d07bfcb5f167560be95fee5bea6a
Merge: fa97c86 ee715f2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 04:32:21 2013 -0800

    Merge "Merge "Merge "hwc: Add binder interface to get the visibleRegion"""

commit d640fc224ddd13ed47a98729498d1c5ffe8f9018
Author: Baldev Sahu <bsahu@codeaurora.org>
Date:   Thu Dec 19 18:49:28 2013 +0530

    hwc: remove displaying unused pipe in dump if set overlay fails

      If overlay set is failed, "pipe book is updated" with correct
      used state, but dump does not check the used state of the pipe
      and display the pipe info.

    Change-Id: I6631311df30401f40efc5e626747d4fc4fcb64fe

commit ee715f28de5e4868f46517163ff6b18f2de83760
Merge: fa97c86 0811dcc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 31 00:37:18 2013 -0800

    Merge "Merge "hwc: Add binder interface to get the visibleRegion""

commit 0811dccaad3f3e64e149e8f70eb3058d44365c44
Merge: 0821325 f4775fa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 21:34:03 2013 -0800

    Merge "hwc: Add binder interface to get the visibleRegion"

commit 0821325bf8d7f836d107cf612e28e6850c5bb7d5
Merge: 5e5c26f 3632ae8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 21:34:02 2013 -0800

    Merge "hwc: Calculate viewframe from layers display frame information."

commit 5e5c26fde60722c3adbdfa4b3a4583fa2eb97cd7
Merge: c71c7f0 5ff45f7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 21:34:02 2013 -0800

    Merge "qdutils: Add display config to qdutils"

commit c71c7f0f63052c8dc50b18c2a21c0796a79111f0
Merge: f1089d3 8382b9c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 21:34:01 2013 -0800

    Merge "display: Clean up binder interface"

commit fa97c8632febd4a019d0f9d389bc596ee34e9e7e
Merge: 491648f 02d0305
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 19:58:15 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit 02d03057dddf2658ae2e4e487ab29cfc61c2b870
Merge: 491648f f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 16:01:46 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit 491648f2c9568185f5db41910e3c13923a22d7a8
Merge: e25e63e 3b751fa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 15:51:15 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit 3b751fa1966e3332ae7c47fda54c7930e0376d3e
Merge: e25e63e f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 11:43:14 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit e25e63e22f395c5a293df7e09910ecd4206469df
Merge: cf8cab8 0db45f9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 11:32:14 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit 0db45f91984f07c76087ed8cbc2e54df826f97ed
Merge: cf8cab8 f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 07:16:54 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit cf8cab8dc555ea79379bca7d08531c01d9223a3e
Merge: 29bc762 ae6ded4
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 07:05:33 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit ae6ded48ace64439e4e9f1d3c2a17b94c73c4697
Merge: 29bc762 f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 03:00:53 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit 29bc7623a9c2cc89b3a9d224ee8fc82416037c8a
Merge: 383f19a 84ad40a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 30 02:49:13 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit f4775fad31e445e1033ac9205400eeaf7cb65217
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Fri Dec 6 18:55:41 2013 -0800

    hwc: Add binder interface to get the visibleRegion

    - This binder interface can be used by clients to know the
      active visible region for a display(pri/ext/virt)
    - When external orientation is used, return the destFrame of
      the FrameBuffer layer, as its the viewFrame

    Change-Id: I7cfd149c76c16b9a3031103c89b1932d44bcbecd

commit 3632ae849dc56dcea2cdff4352a552a2091c38f1
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Wed Dec 4 15:15:42 2013 -0800

    hwc: Calculate viewframe from layers display frame information.

    Calculate view frame of  each display from the displayframe of all
    the application layers.

    Change-Id: I9ba4076b7b4419bd3559417fad28b4e1de6acff3

commit 5ff45f7243221a19b7e64ce4875e6f5d57ad4e3b
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Mon Nov 25 18:12:23 2013 -0500

    qdutils: Add display config to qdutils

    This API is meant for system level users that need to get/set
    various display attributes that are normally not available via
    the regular Android framework channels.
    Initially the APIs exposed are to check HDMI status, get display
    attributes and set HSIC data.
    Only physically connected displays are supported for now.

    Change-Id: Ia783ce2ab0c4599a54c992171e01e2f0504550dc

commit 8382b9c503670cced5d096932da432d02908ea91
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Nov 12 18:07:15 2013 -0500

    display: Clean up binder interface

    The current binder implementation is inflexible when it comes to
    adding new input/output parameters. It also needs a lot of
    boilerplate code written when adding a simple enable/disable type
    command.

    Instead, let clients specify the parcels they want to pass and
    unparcel them at the end points only.
    Please note that it is assumed that all commands coming in
    need the same permission checks. If this is no longer the case,
    some commands need to be split out on the receiver end in
    IQService.cpp.
    This change also simplifies the code end clients need to write.
    They should be able to include QServiceUtils and call a single
    function to set the binder up and make the call.

    Change-Id: I4db66f2427ecf16d7a6264462ae85815217a16b1

commit 84ad40a184ab2301154900f5b2837c1a7da16943
Merge: 383f19a f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Dec 29 21:50:45 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit 383f19a1a94a336a33774a458b97d740d03a7b2b
Merge: 2ddcb33 4ea0e16
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 28 20:28:03 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit 4ea0e166aecaea08b9718a0e1bb71767d0310dfd
Merge: 2ddcb33 f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 28 16:28:34 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit 2ddcb33cb950fd24574d9035f240b2cd3128fc0e
Merge: 9a5a3c3 2ac216b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 28 16:17:57 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit 2ac216bcf2fe22ffce36bdfc7ada25c84cdc1977
Merge: 9a5a3c3 f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 28 12:20:02 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit 9a5a3c3fae02f4484b712aab6be58ba24158da61
Merge: bd588e1 b4f9431
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 27 23:32:58 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit b4f9431bf593423faa72563ae0bc6cc090c8b426
Merge: bd588e1 f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 27 19:25:19 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit bd588e1289015d4f675c8d374d9ea84b8a7aacdd
Merge: d689434 0a7c5f7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 27 12:26:36 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit 0a7c5f7e2b4e81e27b39da97fa81aefc07ff1a6f
Merge: d689434 f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 27 08:28:40 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit d689434c0bfb1fb917dfc77aa7fd567045ed8c54
Merge: 36b4c46 824c3b6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 27 08:17:49 2013 -0800

    Merge "Merge "Merge "fix fd leak in memtrack.msm8960"""

commit 824c3b67f39df63731ceebc9c531155e1770cd56
Merge: 36b4c46 f1089d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 27 04:16:26 2013 -0800

    Merge "Merge "fix fd leak in memtrack.msm8960""

commit 36b4c4659be1e7b1b05e7cbebfbe70fcd7182d86
Merge: 9a6487d 090a25e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 27 01:39:50 2013 -0800

    Merge "Merge "Merge "libhwcomposer: Log and dump app layers of screen frames"""

commit f1089d3b741920e57fa9d4946a7a558dc2cccf67
Merge: 2535d54 773b63e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 26 23:41:19 2013 -0800

    Merge "fix fd leak in memtrack.msm8960"

commit 090a25e172ce02c493ca033128e0fcb54a310247
Merge: 9a6487d 2535d54
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 26 21:37:00 2013 -0800

    Merge "Merge "libhwcomposer: Log and dump app layers of screen frames""

commit 9a6487ddd9791abb6e1a96fa834ee089ef0eff1c
Merge: 88c5774 b4e768f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 26 21:25:45 2013 -0800

    Merge "Merge "Merge "libhwcomposer: Log and dump app layers of screen frames"""

commit b4e768f386657cd293e87682ad83f58467831783
Merge: 88c5774 2535d54
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 26 17:21:41 2013 -0800

    Merge "Merge "libhwcomposer: Log and dump app layers of screen frames""

commit 88c57748ba2f469379915d70917a49a373c40468
Merge: c4e171b a4e3a38
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 26 02:47:37 2013 -0800

    Merge "Merge "Merge "libhwcomposer: Log and dump app layers of screen frames"""

commit a4e3a386e410d8d06283cf3d3b56eb48c53c80d9
Merge: c4e171b 2535d54
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 24 07:32:29 2013 -0800

    Merge "Merge "libhwcomposer: Log and dump app layers of screen frames""

commit c4e171bf2c1e48903b3fd082107e890db53c15b2
Merge: 38d290e 74ec4d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 24 07:20:18 2013 -0800

    Merge "Merge "Merge "libhwcomposer: Log and dump app layers of screen frames"""

commit 74ec4d387361c41a71646cc4ea42569410e19b08
Merge: 38d290e 2535d54
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 24 03:20:11 2013 -0800

    Merge "Merge "libhwcomposer: Log and dump app layers of screen frames""

commit 38d290e5e6ce97d41b761f9452dc7ea147189875
Merge: acf4592 d16080e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 24 03:06:30 2013 -0800

    Merge "Merge "Merge "hwc: Enable rotator during resolution change."""

commit 2535d54d3e4d519ceb54a9a3a2bed4f72467d94d
Merge: 5e8da6d 735d497
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 24 00:02:42 2013 -0800

    Merge "libhwcomposer: Log and dump app layers of screen frames"

commit d16080eafd6725c4380c42d9bef21f91f3c5919d
Merge: acf4592 5e8da6d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 23 21:59:22 2013 -0800

    Merge "Merge "hwc: Enable rotator during resolution change.""

commit ae0de214b27654ef206fb1a83852bde0ea090333
Merge: f777aa7 2932dcb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 23 11:25:46 2013 -0800

    Merge "hwc: Enable rotator during resolution change."

commit 2932dcb2427d25b97bc339011a8cd5e8cd9fb06d
Author: Baldev Sahu <bsahu@codeaurora.org>
Date:   Mon Dec 23 14:18:50 2013 +0530

    hwc: Enable rotator during resolution change.

    - MDP VG pipe framesize register is not double bufferred.
      It introduces corrupted frame during resolution change especially when
      rotator is not used. Enable rotator to handle the transition case.

    Change-Id: I48147ed812bec17fea2990260f600aa84d9f1144

commit 5e8da6d370ec33fa1c14d62bd6b709db3d0674eb
Merge: 9a670f5 6c77e29
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 23 07:22:48 2013 -0800

    Merge "hwc: Enable rotator during resolution change."

commit 6c77e294731111368455dd137428b88e5c992818
Author: Baldev Sahu <bsahu@codeaurora.org>
Date:   Mon Dec 23 14:18:50 2013 +0530

    hwc: Enable rotator during resolution change.

    - MDP VG pipe framesize register is not double bufferred.
      It introduces corrupted frame during resolution change especially when
      rotator is not used. Enable rotator to handle the transition case.

    Change-Id: I48147ed812bec17fea2990260f600aa84d9f1144

commit acf4592c76467ba4b2e2b71b5f46d2d9fa3a8d48
Merge: f777aa7 f7f1b61
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 23 00:39:27 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit f7f1b61119d6be57d74aa9ad826b0ee46b2685e5
Merge: f777aa7 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Dec 22 20:36:49 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit f777aa78a18c6e893eecfcb7a63c1360d42df106
Merge: bb6243b 50515e3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 21 18:50:52 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit 50515e38799467bf87a517cc065262a5eeb78ec7
Merge: bb6243b 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 21 14:45:37 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit bb6243b5901ac9321da963a368ddf39388d9aa73
Merge: 930becf 24c6438
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 21 12:16:06 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit 24c6438e019b528ea2ff6edca19a1b3ccdc788e1
Merge: 930becf 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 21 08:10:36 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit 930becfa358ca4ee11a5bd96581264b5e1fd7724
Merge: 0d0571c c9b3bb8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 21 07:59:59 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit c9b3bb85b4277d35ed8c8a7e24297af1f6fc81d2
Merge: 0d0571c 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 21 03:25:28 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit 0d0571c1dc5009e223a00d99011b4cbd14788950
Merge: 8709400 4579d7b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 21 03:15:22 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit 4579d7bfcd1884f7b4b35343ae54c5d1ef6896b2
Merge: 8709400 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 20 22:58:52 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit 87094007ad20212679fc42535c62ff205e1f9151
Merge: 885fc71 b53251e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 20 22:48:17 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit b53251e0b35df91fa5d3acff9f8eb157d280e831
Merge: 885fc71 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 20 18:36:19 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit 885fc7173ddbc27172093a7673c0c30db811aaa5
Merge: c7884df c5e8640
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 20 18:21:32 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit c5e8640aa1e0f06f5c79ede49c8f1ceb91c89c86
Merge: c7884df 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 20 14:10:46 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit c7884dfb011140decadd287b72dd4af2b3a89b65
Merge: 98f19d2 01f2cc6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 20 01:44:33 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit 01f2cc67825f4559c7b24646251ae74cc2371e75
Merge: 98f19d2 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 21:28:29 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit 98f19d228edc9ae03376b66d8239b3a7d92097a0
Merge: cbe4d9a 22f07ca
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 21:17:23 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit 22f07cad4498ad48d21a7d038badc5c5a7b8bce4
Merge: cbe4d9a 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 16:41:09 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit cbe4d9add9b543d2203f67eea4b7d03d82f26956
Merge: 429f4cf a370cb3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 16:28:15 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit a370cb36814de2a5c3d3e7539af89d192d2496f1
Merge: 429f4cf 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 12:07:33 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit 429f4cfea07e8169d705daf1fdfc2b0e2246c6c5
Merge: d8cea18 f3e27ed
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 11:50:37 2013 -0800

    Merge "Merge "Merge "hwc: Crop source rect for the optimized destination"""

commit f3e27ed614fbb79d4f116cc88ed52361605f96fc
Merge: d8cea18 9a670f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 07:43:44 2013 -0800

    Merge "Merge "hwc: Crop source rect for the optimized destination""

commit d8cea18a1c42e0193372815b2cc2ed5ce8d75fd4
Merge: 43e7049 91ae4d1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 07:32:28 2013 -0800

    Merge "Merge "Merge "hwcomposer : Fix copybit render buffer fence usage."""

commit 9a670f5b9a09b17387d87cdda37271a778893a32
Merge: bb64c6b abe93ae
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 05:35:07 2013 -0800

    Merge "hwc: Crop source rect for the optimized destination"

commit bb64c6bf88a5b5f166ff940d44965baed2841982
Merge: 3728434 22475d2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 05:35:06 2013 -0800

    Merge "hwc: Add deduction operation to Rect utils"

commit 372843447504da3d49d5a3fe2706e4a8bc9e65d5
Merge: 40440c2 9331718
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 05:35:05 2013 -0800

    Merge "hwcomposer : Fix rotator fence for FB pre rotation."

commit 40440c267250fe43699522b2be170b3844cfd2c2
Merge: cfb42fe 228bce6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 05:35:04 2013 -0800

    Merge "HWC: Fix for use int reference in function call"

commit 735d497446d57650fab9df469196362e865453d2
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Fri Apr 5 17:46:55 2013 -0700

    libhwcomposer: Log and dump app layers of screen frames

    Log a frame-by-frame succession of HWComposer layers' data and write
    their buffers, if any, into raw or png files based on system property
    values.

    Change-Id: Icceccf5fff5ab4d78dbc6c28c11210b8837ddfd9

    Conflicts:
    	libhwcomposer/Android.mk
    	libhwcomposer/hwc.cpp
    	libhwcomposer/hwc_utils.cpp
    	libhwcomposer/hwc_utils.h

commit 91ae4d12df56684fb640f3ca7ee7bc46be243e77
Merge: 43e7049 cfb42fe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 03:09:12 2013 -0800

    Merge "Merge "hwcomposer : Fix copybit render buffer fence usage.""

commit 43e70498623ea32954d4d73243a1294b24a281bd
Merge: f0b15b1 b47c0b4
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 19 02:55:30 2013 -0800

    Merge "Merge "Merge "hwcomposer : Fix copybit render buffer fence usage."""

commit b47c0b44563938e1fab47c54c8846be60ae1b7da
Merge: f0b15b1 cfb42fe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Dec 18 22:36:25 2013 -0800

    Merge "Merge "hwcomposer : Fix copybit render buffer fence usage.""

commit f0b15b10c399b5b1ac5963832b7daf5984ce34e5
Merge: b6adf40 3393d25
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Dec 18 03:43:24 2013 -0800

    Merge "Merge "Merge "hwcomposer : Fix copybit render buffer fence usage."""

commit 3393d25a81a649f642144043b5d6c348a20c18ec
Merge: b6adf40 cfb42fe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 17 23:30:32 2013 -0800

    Merge "Merge "hwcomposer : Fix copybit render buffer fence usage.""

commit b6adf4035ccc7e28c58ada5ab74114d3a6a7b1c2
Merge: ed35ea8 0b640f1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 17 00:27:32 2013 -0800

    Merge "Merge "Merge "hwcomposer : Fix copybit render buffer fence usage."""

commit 773b63ebc8025d738bc3043de8634f276564c22e
Author: Colin Cross <ccross@android.com>
Date:   Mon Sep 30 13:09:02 2013 -0700

    fix fd leak in memtrack.msm8960

    Close smaps_fd when exiting function.

    Bug: 11007903
    Change-Id: I4a9fcd1e84aae195d229e5dd11f99ccb9f6f5006

commit 0b640f1de2e4f847e6e5354ea46ae0cbf80f1069
Merge: ed35ea8 cfb42fe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 16 20:29:06 2013 -0800

    Merge "Merge "hwcomposer : Fix copybit render buffer fence usage.""

commit ed35ea80453c179f2a8c07374ac399bdc1312e53
Merge: 434cbe3 240b81c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 13 17:33:13 2013 -0800

    Merge "Merge "Merge "hwcomposer : Fix copybit render buffer fence usage."""

commit 240b81c5a9f46ef1912a86aa94c234b86e66ad60
Merge: 434cbe3 cfb42fe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 13 07:01:20 2013 -0800

    Merge "Merge "hwcomposer : Fix copybit render buffer fence usage.""

commit 434cbe32567bc1c872773787458a28d20236923a
Merge: 7e06282 097f4fd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 13 06:47:26 2013 -0800

    Merge "Merge "Merge "Donot compose layers if external is in pause state"""

commit 097f4fd0bbc72cac2d145538673d9e24837a9eea
Merge: 7e06282 e90397e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 12 23:46:46 2013 -0800

    Merge "Merge "Donot compose layers if external is in pause state""

commit 7e06282b1c59ac1b403d18f6a6dd07d2e7c25d2e
Merge: 2b4a41f 6e897cf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 12 22:22:14 2013 -0800

    Merge "Merge "Merge "Donot compose layers if external is in pause state"""

commit 6e897cf3eab066a68fdd3895dc9111d9cf6c733d
Merge: 2b4a41f e90397e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 12 17:36:50 2013 -0800

    Merge "Merge "Donot compose layers if external is in pause state""

commit 2b4a41f1ae4a3f3661c076f7b748dbf6a224395c
Merge: 6057998 4154f74
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 12 17:23:46 2013 -0800

    Merge "Merge "Merge "Donot compose layers if external is in pause state"""

commit 4154f740f8eb4007f810e7e39ba4a7ef773a8fc8
Merge: 6057998 e90397e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 12 12:10:05 2013 -0800

    Merge "Merge "Donot compose layers if external is in pause state""

commit 60579985c60261fe3be109e15a74b8f4603c3a6a
Merge: a4ad993 0fee351
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 12 05:34:36 2013 -0800

    Merge "Merge "Merge "hwc: Do not use fb handle in hwc_prepare"""

commit 0fee35154065bb876bfcc7171f95c8ada4f7e1d7
Merge: a4ad993 a6b8a88
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 12 00:57:49 2013 -0800

    Merge "Merge "hwc: Do not use fb handle in hwc_prepare""

commit 93317188dec67635cf70612260e5813b3b8e9375
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Wed Oct 30 17:29:46 2013 +0530

    hwcomposer : Fix rotator fence for FB pre rotation.

    Add framebuffer to rotator map data structure if
    rotator is used for pre rotating framebuffer.

    Change-Id: I496656c22b289b0bb0bf8c49056384a7fad3ac7d
    CRs-fixed: 569696

    Conflicts:
    	libhwcomposer/hwc_fbupdate.cpp

commit abe93ae90ec72da60aed06357c5e8f10f08bdc0b
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Wed Dec 4 16:22:34 2013 -0800

    hwc: Crop source rect for the optimized destination

    If a layer destination can be optimized, its source rect
    needs to be cropped for the optimized destination rect.

    Change-Id: If9a9891200d9cea52b58b253299b4007197cd9e5

commit 22475d26da0ca56efb8307aa17d1a19749527487
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Fri Nov 8 18:05:11 2013 -0800

    hwc: Add deduction operation to Rect utils

    Seperate out rectangle deduction from the layer cropping. Update
    layer sourceCrop and displayFrame after deducting the rect value.
    This makes the function generic enough to be used by other
    modules

    Change-Id: I587ac951357af823a1bf5e06c15ff47ac6a9c2a0

commit a4ad993737ccb2c87bcac88309bb2deb7d461958
Merge: 5ed9808 f2bdd70
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 10 00:19:29 2013 -0800

    Merge "Merge "Merge "hwc: Do not use fb handle in hwc_prepare"""

commit 228bce637beaa0cf52a259c322366fcad195192e
Author: Arpita Banerjee <cabane@codeaurora.org>
Date:   Fri Dec 6 20:14:23 2013 -0800

    HWC: Fix for use int reference in function call

    To use the integer reference, declared integer
    variable to get value directly in that variable.

    Change-Id: I1fd1a45580be99dd95ccbc3495e28455a4c7de23

commit f2bdd7092061810241cf3b997274a1c9f7ad41f9
Merge: 5ed9808 a6b8a88
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 9 19:21:20 2013 -0800

    Merge "Merge "hwc: Do not use fb handle in hwc_prepare""

commit 5ed9808049099f69c8b8084013fd67eb2232decd
Merge: 9251748 8c9ad2e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 9 14:26:57 2013 -0800

    Merge "Merge "Merge "hwc: Do not use fb handle in hwc_prepare"""

commit 8c9ad2e6333a477a53832026734b8a1d43537c55
Merge: 9251748 a6b8a88
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 9 10:14:15 2013 -0800

    Merge "Merge "hwc: Do not use fb handle in hwc_prepare""

commit 9251748d8bb5d62b359328601dae17d306670461
Merge: 02a3a4e 9b020f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 9 10:01:54 2013 -0800

    Merge "Merge "Merge "hwc: Do not use fb handle in hwc_prepare"""

commit 9b020f5362f2908695cb6e52579887dfa7f2fabb
Merge: 02a3a4e a6b8a88
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 9 05:52:35 2013 -0800

    Merge "Merge "hwc: Do not use fb handle in hwc_prepare""

commit 02a3a4e76902acf3cf38f877fe6a3e525a2243d7
Merge: 448aab6 a3202d9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 9 05:40:10 2013 -0800

    Merge "Merge "Merge "hwc: Do not use fb handle in hwc_prepare"""

commit a3202d9a83dda2751e7e33f6478dd3d9cccb97e8
Merge: 448aab6 a6b8a88
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 9 01:04:07 2013 -0800

    Merge "Merge "hwc: Do not use fb handle in hwc_prepare""

commit 448aab65b65330a9da0848f591fbf7adb8de6ccc
Merge: 17b89b5 36b4fb2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 7 06:14:44 2013 -0800

    Merge "Merge "Merge "libgralloc: correct assigment of HAL_PIXEL_FORMAT_RGBA_8888"""

commit 36b4fb208f2f6739b1098c31107f22a6ec2f30e0
Merge: 17b89b5 3e71c90
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 7 01:24:12 2013 -0800

    Merge "Merge "libgralloc: correct assigment of HAL_PIXEL_FORMAT_RGBA_8888""

commit 17b89b5419506e04b54709227f9b73b5236f8b25
Merge: 8a95f1f 5e02f7a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 6 23:47:05 2013 -0800

    Merge "Merge "Merge "libgralloc: correct assigment of HAL_PIXEL_FORMAT_RGBA_8888"""

commit 5e02f7ad129b977b225b1937cbec59880d66f839
Merge: 8a95f1f 3e71c90
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 6 18:35:26 2013 -0800

    Merge "Merge "libgralloc: correct assigment of HAL_PIXEL_FORMAT_RGBA_8888""

commit 8a95f1fd6c0801eaab5f232e6c579f817294be2f
Merge: 444548b cc7d758
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 6 18:24:39 2013 -0800

    Merge "Merge "Merge "libgralloc: correct assigment of HAL_PIXEL_FORMAT_RGBA_8888"""

commit cc7d7585b695819fe5be24189d46ed113af77d4f
Merge: 444548b 3e71c90
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 6 14:01:32 2013 -0800

    Merge "Merge "libgralloc: correct assigment of HAL_PIXEL_FORMAT_RGBA_8888""

commit 444548b714e1261793e0179c6b0b7bf9d9bac744
Merge: 2587c24 d0ccb44
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 6 13:47:18 2013 -0800

    Merge "Merge "Merge "libmemtrack: Add correct target information"""

commit d0ccb441b98f084bf68db9a054a866c795800e11
Merge: 2587c24 8fc8330
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 5 01:25:25 2013 -0800

    Merge "Merge "libmemtrack: Add correct target information""

commit 2587c246111d2f8d4d8519830231a6b3f5f5dce1
Merge: 83ef3ab 0a129fc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Dec 4 04:09:36 2013 -0800

    Merge "Merge "Merge "Avoid ov set failures in rapid wfd pause/resume"""

commit 0a129fcfc99001ba501607c06012d0509d67af96
Merge: 83ef3ab 2956c6a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 3 23:43:55 2013 -0800

    Merge "Merge "Avoid ov set failures in rapid wfd pause/resume""

commit 83ef3ab2cba86b43fb54cc5e8d3a49d05082b003
Merge: ad3e00d 687e8e8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Nov 25 12:28:18 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 687e8e8b6deac798b17388817d045ef809237453
Merge: ad3e00d 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Nov 25 07:43:57 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit ad3e00d82ff2028cf46cbb6ba39aa07af2ed33a4
Merge: 31fc06e db025a2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Nov 25 07:32:06 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit db025a2b07c48f464dc1a496283408d70b21ddc7
Merge: 31fc06e 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Nov 25 03:09:56 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 31fc06ee2025ccb18adf3606214dc22184d6c937
Merge: f6cc5a1 a2ff710
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Nov 25 02:56:00 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit a2ff710cdb60f7b5c3115d2dd9f2f1293b3c24d5
Merge: f6cc5a1 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Nov 24 21:44:45 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit f6cc5a1791ba8b9925e4cc647aad646cdc172c23
Merge: 42ef2e6 d7c8618
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Nov 24 09:03:12 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit d7c861853f88e259c9ef10e08547408c86241047
Merge: 42ef2e6 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Nov 24 04:44:13 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 42ef2e6f43c2b4f62b3782df5ecfd86a42592982
Merge: 45b65b9 fff260a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Nov 24 04:33:54 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit fff260a0f366653008af105ddee445a821c54e13
Merge: 45b65b9 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Nov 23 18:54:44 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 45b65b99d894269868ced43b6c439c3cf089d5d9
Merge: 24928f8 3a4a762
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Nov 23 18:44:57 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 3a4a76214c90af5518c99996f8991aa2cc40c546
Merge: 24928f8 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Nov 23 13:40:51 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 24928f824f7a6d4415a6f5776c88ea1d76eb3b18
Merge: fd87910 08a1c28
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Nov 23 13:30:45 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 08a1c287b291bb34efadaf54a177db06b5a716c7
Merge: fd87910 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Nov 23 03:52:51 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit fd879100ead57551dc99ff275f75a32dc8fc2ae3
Merge: bdd78e9 7aa1f61
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Nov 22 14:59:34 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 7aa1f61c83b0145f14db616a15f91c91df03b464
Merge: bdd78e9 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Nov 22 10:26:31 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit bdd78e9c49c569aba02692f5f622d7cd7549c344
Merge: f6745a1 0649004
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Nov 22 10:16:20 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 0649004738e65a51c11e00598e4d902a2e5c7c60
Merge: f6745a1 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Nov 21 18:49:44 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit f6745a1e1456db166ed0c5c5ce6ed1369600b4c1
Merge: 215db9a b586934
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Nov 21 18:37:16 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit b586934ee3c57b852b1681840d934bb05c4d5f86
Merge: 215db9a 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Nov 21 13:53:10 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 215db9a2eb5aac8a0f97837a8b94d5df5de73eae
Merge: 7ddc1e3 af5a141
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Nov 21 10:02:49 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit af5a141c1ec243756547952696d88788702ed1de
Merge: 7ddc1e3 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Nov 21 05:30:10 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 7ddc1e366207ba1ff729da132b0ce110a4254e59
Merge: 41048f9 d189e1d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Nov 21 04:45:00 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit d189e1ddac204e41caa0ed2c97dd977e80e0b517
Merge: 41048f9 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Nov 20 22:39:03 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 41048f9274c35f1f538af47e216b782701149079
Merge: ce45d59 6c0260e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Nov 20 21:36:17 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 6c0260e01df5d368f281f6a3a69c74775d636fae
Merge: ce45d59 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Nov 20 17:16:07 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit ce45d59f99f4b52027e93a7e89fe665720d87826
Merge: 39f5b3e e53e4e4
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Nov 20 15:13:32 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit e53e4e41012f7c6d1971b70ffde7cfcf9a0a7144
Merge: 39f5b3e 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Nov 20 09:20:26 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 39f5b3e6e72c6f0361dcd83be0d4e1b1242ecd08
Merge: 28d3803 4871ee3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Nov 19 17:25:15 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 4871ee367eea48d8b633864ea453a2b3c2b08d36
Merge: 28d3803 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Nov 19 12:55:57 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit 28d38038bdf3780ee115033fbe7c503f759f8817
Merge: dddc853 6f7e992
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Nov 19 06:33:25 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 6f7e992a4d3f148e0374ff5aaf287b9c2dec7a8b
Merge: dddc853 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Nov 19 02:17:35 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

commit dddc85318ba6c8f7905357be310b38f0d5992dfe
Merge: ef0a395 1c7c856
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Nov 19 01:30:47 2013 -0800

    Merge "Merge "Merge "WFD video playback scenario in downscale mode."""

commit 1c7c856282af6f90989436be757eb30504f35c46
Merge: ef0a395 14cb7bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Nov 18 18:24:32 2013 -0800

    Merge "Merge "WFD video playback scenario in downscale mode.""

Change-Id: Ifb4a5eff7f3dbe1390dc845f595886aad8e5ed8e
hwc: Add support to enable CABL for video use case only

Set property "persist.qcom.cabl.video_only" to 1 to enable this
feature. With this feature, CABL will be turned on only during video
play cases. CABL will turn off for UI cases.

Bug: 9414907
Acked-by: Ping Li <quicpingli@codeaurora.org>
Change-Id: I7dee9e03685bdf8e5f69ad5004e63f15dd028333
Signed-off-by: Iliyan Malchev <malchev@google.com>

hwc: Ignore SIGPIPE error when communicating with ppd

This avoids a potential crash in HWC if a SIGPIPE is thrown due
to failure communicating with the other end.

Bug: 9414907
Change-Id: I7f1de4f2ff0f287de4cad29dd92a6e964ba50224
Signed-off-by: Iliyan Malchev <malchev@google.com>

hwc: Don't run CABL when HDMI is connected

There is no power benefit with CABL when HDMI is on.

Bug: 9605980
Change-Id: I57b3af493e0af54db520fea04dc3a2d007943b82
Signed-off-by: Iliyan Malchev <malchev@google.com>

hwc: Don't kill ppd when HDMI is on and primary also has video

There is still a power impact when video is playing on primary
with HDMI connected.

Bug: 9680403
Change-Id: Ia12710194ea6ebc677c7a86731a409333853ccfc
Signed-off-by: Iliyan Malchev <malchev@google.com>

hwc: Set a timeout when communicating with CABL

Bug: 9669813
Acked-by: Ping Li <pingli@codeaurora.org>
Change-Id: If0f65e9ee100b368e46f8f6d4edf9d7a93120bed
Signed-off-by: Iliyan Malchev <malchev@google.com>

hwc: Handle the broken pipe issue between hwc and ppdaemon

If broken pipe is detected, close and then re-establish the connection
between hwc and ppdaemon.
Acked-by: Ping Li <pingli@codeaurora.org>

Bug: 9850103
Change-Id: I68ff21b93ab5b40608ca9ab4951adaa9d75fa17e
Signed-off-by: Iliyan Malchev <malchev@google.com>

hwc: Resend the command after broken pipe is fixed

Bug: 9850103

Change-Id: Ia2ee8019394ce1397fe7eaf73a44a00b0b78e88c
Merge commit 'refs/changes/48/57448/1' of http://review.cyanogenmod.org/CyanogenMod/android_hardware_qcom_display-caf into HEAD

Conflicts:
	libhwcomposer/hwc_utils.h

Change-Id: I4ad41cdc6ae4a0bdefdf6c60a27a9ff5a0839b61