Squashed commit of the following:

commit 4b38bc774e5903fc8a9df6ef702deb10486a6c6d
Merge: a1c3cfb 2f64a6b
Author: Wizard0f0s <jamie.gilmer@gmail.com>
Date:   Sat May 18 19:13:26 2013 -0400

    Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_hardware_qcom_display-caf into cm-10.1

    Conflicts:
    	libcopybit/copybit.cpp
    	libcopybit/copybit_c2d.cpp
    	libexternal/external.cpp
    	libexternal/external.h
    	libgralloc/alloc_controller.cpp
    	libhwcomposer/hwc.cpp
    	libhwcomposer/hwc_copybit.cpp
    	libhwcomposer/hwc_mdpcomp.cpp
    	libhwcomposer/hwc_mdpcomp.h
    	libhwcomposer/hwc_uevents.cpp
    	libhwcomposer/hwc_utils.cpp
    	libhwcomposer/hwc_vsync.cpp

    Change-Id: Ia818a5d8641bc495e71ed0dcf7cb9beb7d4cb080

commit 2f64a6b4830da4f8216276539f2be3d781b1b74f
Author: Giulio Cervera <giulio.cervera@cyanogenmod.org>
Date:   Sat May 18 09:48:06 2013 +0200

    Revert "liboverlay : unset basepipe on overlay intialization."

    This reverts commit 6b837723604058938da48a20a07583203113a50e.

commit f97c92e8fca71889b8feccf974cfffbc124c04fe
Merge: 92dbd42 801ea5b
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu May 16 11:15:08 2013 -0700

    Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.312' of git://codeaurora.org/platform/hardware/qcom/display into cm-10.1

    AU_LINUX_ANDROID_JB_2.5.04.02.02.040.312 based on quic/aosp/jb_2.5

commit 801ea5b4be81cc2c907ba9e0bc1e22828056c603
Merge: 5616dd6 b24b13b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 15 01:27:53 2013 -0700

    Merge "hwc/copybit: Add check for Max layers support."

commit 5616dd66717233941b7a40f51854b7dabca3b0ce
Merge: 0668f55 ba955cf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 14 23:28:26 2013 -0700

    Merge "hwc: In MDPcomp, set isFg flag for the first layer"

commit b24b13b75d819404c32d6bd3185983491345a03e
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Mon Apr 29 18:35:54 2013 -0700

    hwc/copybit: Add check for Max layers support.

    Add check in copybit for Max. layers supported by HWC. Increase
    max. RGB surfaces to MAX_NUM_LAYERS to support known use cases.

    CRs-Fixed: 481226
    Change-Id: Ie30ab0ef3047a304133cb547902ae11fecc5db22

commit 0668f55761550e54b3b6f0fb161b15bb39752284
Merge: 9e4eb4c 6b83772
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 9 11:18:05 2013 -0700

    Merge "liboverlay : unset basepipe on overlay intialization."

commit ba955cf96360c842c6620d64b1b9925e9805fa9d
Author: radhakrishna <radhakrishna@codeaurora.org>
Date:   Thu May 9 18:48:39 2013 +0530

    hwc: In MDPcomp, set isFg flag for the first layer

    Set isFg flag for the layer with zorder 0 for proper blending
    to happen in Mdp composition.

    Change-Id: Ibcb158f2049aa8713267feec93f299866fe74d52
    CRs-Fixed: 481497

commit 92dbd42b7fa4af278d5509fb1005c454444443a3
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed May 8 17:32:25 2013 -0700

    hwc: Only enable vsync delay logging for debug builds

    Change-Id: I56d0c67b3742358d4cd7439c7b6f735e0a35a055

commit 47aa5b2c6c1eccf88ac8e354ccae53d44670f6f4
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue May 7 17:27:16 2013 -0700

    gralloc: Backward compat for devices using older camera heap

    Change-Id: I5d3feadd0c4dd629fcb3a750e9d4be0c6b3d6a6f

commit 9fa99ff020ba961e1e8b6ce488bfa116356ae473
Author: Chirayu Desai <cdesai@cyanogenmod.org>
Date:   Wed May 8 10:35:54 2013 +0530

    Revert "gralloc: Cleanup usage of old API"

    This reverts commit b519bb243a1537f7420a2e81bbfa91d38d4ae8dc.

    Conflicts:
    	libgralloc/ionalloc.cpp

    Change-Id: I3708dff82207844302431296ccfc29421d104442

commit 7d0abf9c0d2966dfc00122be827aa2fecf56a19f
Merge: c417b64 9e4eb4c
Author: Steve Kondik <shade@chemlab.org>
Date:   Wed May 8 13:02:39 2013 -0700

    Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.295' of git://codeaurora.org/platform/hardware/qcom/display into cm-10.1

    AU_LINUX_ANDROID_JB_2.5.04.02.02.040.295 based on quic/aosp/jb_2.5

    Change-Id: Ib98e4771cb520924439034450415d329d4af3292

commit 6b837723604058938da48a20a07583203113a50e
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Tue May 7 14:40:59 2013 +0530

    liboverlay : unset basepipe on overlay intialization.

    On display framework intialization or restart when we are unsetting
    stale MDP pipes connected to mixer, free base pipe too. Base pipe
    gets allocated before composition once on start or restart of framework.

    Change-Id: Ie73915031ffbcf03b6cadf2c526c76be79d582be
    CRs-fixed: 483142

commit 9e4eb4c7eafce1fa2abdd5db65295187df62bb14
Merge: 37cca68 c1c4df0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 6 23:34:10 2013 -0700

    Merge "Fix crash issue arising out of multiple hdmi connect/disconnects"

commit 37cca684738d2f44d90987bc50723b17f52c9d7d
Merge: 113a9de 29b0de8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 6 14:49:05 2013 -0700

    Merge "libcopybit: Fix GPU page fault on c2d use"

commit 113a9dea01e9a6f143578a19af30e5957c28519e
Merge: 100110b 4ccac4a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 6 14:47:26 2013 -0700

    Merge "libexternal: Add support for SPD Information"

commit 100110ba58b6e7661d7a03aafd4bb3db7347c2b7
Merge: 1a513cd 8563640
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun May 5 23:57:48 2013 -0700

    Merge "hwc: Do not include Framebuffer area in calculating total area"

commit 29b0de84ebfd84a2bcbe0c2b2347f1a9bb9e1341
Author: Pawan Kumar <pavaku@codeaurora.org>
Date:   Fri May 3 14:25:49 2013 +0530

    libcopybit: Fix GPU page fault on c2d use

    On HDMI connect or other use cases where finish_copybit
    is called, reset dst_surface_mapped and dst_surface_base
    as destination surface is already unmapped.

    CRs-fixed: 481685
    Change-Id: I0073a46178e6b1ecfdbf0a08d8790af4271bc37b

commit c1c4df07624093a435a7b85060ef875c73b09c36
Author: Raj kamal <rkamal@codeaurora.org>
Date:   Thu May 2 17:28:23 2013 +0530

    Fix crash issue arising out of multiple hdmi connect/disconnects

    Acquire mExtLock before proceeding further in
    hwc_prepare_external to prevent crashes arising out
    of updating ctx variables from two different
    threads(composition and uevent threads)

    Change-Id: I0f18c41b117f18aeb25572b53ef6eba3638bb826

commit 1a513cdc17fec8db2e4b2a2f1d0f8fdc9d8b3a8c
Merge: d4ca973 4e88d96
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 1 23:14:29 2013 -0700

    Merge "libhwcomposer: print a log if there is any delay in vsync read."

commit 8563640419a38ae9d2a7ac2dd2c702950b769ddd
Author: Sravan Kumar D.V.N <sravank1@codeaurora.org>
Date:   Thu May 2 11:00:52 2013 +0530

    hwc: Do not include Framebuffer area in calculating total area

    In dynamic composition, While calculating total render area of
    application layers to decide on which composition to choose,
    FrameBuffer layer area shall not be added to the total render area.

    Change-Id: I712b601031c6faac2d077a8d601cbf9fa82f3d5b
    CRs-fixed: 482264

commit 4e88d962d51dec199348d3721e0bec82a09c3dcd
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Sun Apr 21 18:51:13 2013 +0530

    libhwcomposer: print a log if there is any delay in vsync read.

    If there is a delay in vsync read print a warning message if
    vsync status is enabled.

    Change-Id: Iac875323fca441ff5261f8e9ddef2936e433e84e
    CRs-fixed: 462993

commit d4ca973bc2a42054198db9f05f1522ad3a191f07
Merge: cad020b ba39c0a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Apr 29 12:48:43 2013 -0700

    Merge "libhwcomposer: align rotator source buffers for tile format."

commit cad020b1e5210bf95f7e57cf4843a02ab0a13b86
Merge: e1fb9ac c691dbc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Apr 26 13:51:46 2013 -0700

    Merge "hwc: Add property to differentiate the input image format"

commit e1fb9ac2c3e68a60cd38db5c19822e7f9079b4f7
Merge: 4c6b19c 074307f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Apr 25 13:12:26 2013 -0700

    Merge "hwc: Fallback to GPU if source image width or height is less than 2"

commit 4c6b19cc9fe8d866900f1cb086cbcda9ed68af99
Merge: d2926c7 250d823
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Apr 25 10:58:07 2013 -0700

    Merge "libgralloc: Change CAMERA_HEAP to ADSP_HEAP"

commit c691dbc9f2596bb20b296f21314b687d021a572d
Author: Ping Li <quicpingli@codeaurora.org>
Date:   Wed Apr 24 16:36:03 2013 -0400

    hwc: Add property to differentiate the input image format

    Set different vaules to property hw.cabl.yuv based on the input
    image format, so that mm-pp-daemon can adjust CABL power
    saving levels accordingly.

    CRs-fixed: 464799
    Change-Id: I212035d387a975e61a08749ba118a9da30e18d81

commit 250d823fad7a6fdbb2373772aeb94f6bc8cf9240
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Tue Mar 12 15:08:29 2013 -0700

    libgralloc: Change CAMERA_HEAP to ADSP_HEAP

    This changes GRALLOC_USAGE_PRIVATE_CAMERA_HEAP to
    GRALLOC_USAGE_PRIVATE_ADSP_HEAP as the CAMERA_HEAP
    is not used anymore

    Change-Id: I5a95f68c4c7f4445ade2398dd239faad9ed16b22

commit 4ccac4a6e017a306aa61953582e871db8602f77a
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Mon Feb 11 19:17:05 2013 -0800

    libexternal: Add support for SPD Information

    - SPD: Source product description.
    - Retrieve the product vendor and name from the system
      property and pass it to the hdmi driver.
    - This will display some specific names for source such
      as instead of "Input 1" it might display "QCOM 8974" for
      example

    Change-Id: I5440841b9e47110386c793045f3b30774522dcb6

commit d2926c76776718c479fe441e7a9b5c38e6c69d65
Merge: d7f7773 f41d7e8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Apr 24 13:10:15 2013 -0700

    Merge "hwc: Close Fds in case of errors in openFramebuffer"

commit 074307fe5a17bcaf214c695fdbd3e1ce320c51da
Author: Sravan Kumar D.V.N <sravank1@codeaurora.org>
Date:   Wed Apr 24 14:23:04 2013 +0530

    hwc: Fallback to GPU if source image width or height is less than 2

    There is h/w limitation when MDP_OP_SCALE_RGB_ENHANCED bit and
    MDP4_OP_SCALEX_EN or MDP_OP_SCALEY_EN bit is set.
    The minimum block size is 2x2. MDP will hang if the source RGB image
    height or width is equal to 1. Hence fallback to GPU in such cases.

    Change-Id: I7333b097fd26bfb888865de9c39d1664bc87acca
    CRs-fixed: 477581

commit d7f7773c680f595b357675768b8bbee2afcab650
Merge: 1ecaeaa 310691f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Apr 23 18:49:01 2013 -0700

    Merge "libcopybit: Fix potential memory and surface leaks in c2d"

commit f41d7e8f8c81f20fdd5cdaf9f1acb497122bde27
Author: Sravan Kumar D.V.N <sravank1@codeaurora.org>
Date:   Tue Apr 16 10:24:55 2013 +0530

    hwc: Close Fds in case of errors in openFramebuffer

    Close opened Fds in case of errors in openFramebuffer
    function.

    Change-Id: Ifd80adf1eff0d2efd698cd4abd3980d5c1f333ab
    CRs-fixed: 473488

commit ba39c0adf6ac4665ee62f096ee75567b97bba43d
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Tue Apr 23 13:06:02 2013 +0530

    libhwcomposer: align rotator source buffers for tile format.

    for tile format make the rotator source buffers aligned to 64 X 32.
    This avoids rotator hang during source fetch.

    Change-Id: I9e42788cc6f538b155c073028ce41bf48e1d9349
    CRs-fixed: 473297

commit c417b64e66fc7d6554176bd8902a612192c283fd
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Apr 20 16:32:50 2013 -0700

    gralloc: Add workaround for Jellybean camera drivers

     * Arcee is smarter than I am, and discovered that we can simply swap
       two fields to ensure compatibility with Jellybean camera drivers
       having the metadata fields in the private_handle_t struct.
     * Enable this by defining QCOM_BSP_CAMERA_ABI_HACK.

    Change-Id: I2cd267dd5550404cf2e61d76fb805e780cd99d3c

commit 310691f8f7693bf73f213c088065c0db340533df
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Mon Apr 15 14:26:43 2013 -0700

    libcopybit: Fix potential memory and surface leaks in c2d

    - Check MAX_SURFACES while mapping GPU addr
     --- While mapping gpu address, first check if the request
         is less than the MAX_SURFACES allowed.
     --- Without this check, when the request exceeded MAX_SURFACES,
         there was memory leak as that gpu addr was not unmapped
    - Map the destination surface only once
     --- The destination surface for the c2d blit will be the
         FRAME_BUFFER_TARGET per transaction
     --- Map this only once from the copybit_clear which is the first
         call by hwc for a transaction
    - Increase MAX_RGB_SURFACES to 12
     --- To handle use cases where there are more than 8 RGB layers

    Change-Id: Iffacde30ee88b9c21d0895cb1922aa981bb079e9
    CRs-fixed: 475327

commit 1ecaeaaa06fce40b1a7cec27aa71bef8920bd170
Merge: 8a96b80 9847229
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Apr 19 14:24:47 2013 -0700

    Merge "copybit: Fix type conversion error for GCC 4.7"

commit 8a96b80270f5fceffb4acc1b0e282c7cb696083f
Merge: 73c7ea1 b519bb2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Apr 19 14:24:43 2013 -0700

    Merge "gralloc: Cleanup usage of old API"

commit aa3f91499a47c1d16bc99f7ef98a42a00ee47704
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Apr 11 12:36:02 2013 -0700

    display: Use actual kernel headers for all builds

    Change-Id: I1add22c0bc33942bc8f89dbb37333bf08d49bf72

commit f096252a960beb48d3874260efc11315288ca5b3
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Apr 8 23:57:20 2013 -0700

    hwc: Fix the copybit threshold comparison

    Change-Id: Ife9d54d4592e2427e8de6e67b4c8f62b676b2679

commit 8ba3f53523bd89fad7f86cca8e0197cd575b8929
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Apr 6 02:16:23 2013 -0700

    Revert "gralloc: Align protected allocations with the spec"

    This reverts commit 77f89bea0145f67588ca95b2f55c52b393f70f60.

commit 56d7cb583d5f97797cd61e7de971239b87e6ca1e
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Apr 6 02:11:49 2013 -0700

    copybit: Fallback to SF heap when IOMMU isn't available

    Change-Id: I0baa43a84fa12f8dbde8e958f1bb37f7a46f388b

commit 0291c9bb350fbafd108e8789699b4a92717ff5a1
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Feb 12 14:53:33 2013 -0500

    display: Conditionally restore genlock support

     * Enable genlock support when QCOM_BSP is not defined, as older drivers
       still depend on it.

    Change-Id: Idd1df589516534a683e0fa1ef0cfbb7f0e411f67

commit f8a6661e64857dca146217b31f90aa66bf261efc
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Mon Apr 1 15:34:41 2013 +0100

    gralloc: Let gralloc_priv.h be overloaded by device trees

    Adjustments to private_handle_t may be necessary for device-specific
    blob compatibility, so don't enforce usage of the local header

    Change-Id: I588ca59ed76b1a063a4b663ac2c98589865b7738

commit cf01fceb6218d2834d13f8007ee024e87543d8d9
Author: Steve Kondik <shade@chemlab.org>
Date:   Sun Mar 31 06:18:30 2013 -0700

    Tiny changes to support media codecs with vanilla driver.

    Change-Id: I5415b6af1b13c4d9e95dfe4199325274b1d0f3eb

commit 4b73edb692b9ef0562e53b9a783cc746fb686cbd
Author: Shareef Ali <shareefalis@cyanogenmod.org>
Date:   Tue Mar 12 23:51:08 2013 -0400

    qcomBSP:  put check on new ionalloc

    * prevent compile error when trying to init the same thing over

commit 00cf5eac1fa4d73af27ca17a08ad194ac771e7b7
Author: Josh Ancill <admin@hpaw.net>
Date:   Sat Feb 16 01:20:04 2013 -0800

    Fix ION_IOC_MAP error on old ion api during drm video playback

    Video playback in the Google Play Video app would
    result in an ION_IOC_MAP invalid argument error and
    the app to display error 22.

    This fixes some old ion api code left out with the
    "display: Reconcile display HALs" commit which resulted
    in the invalid arugment or an out of memory error.

    This was found using a Nexus 4 (mako) and the Google Play Movies
    app while attempting DRM video playback.

    Change-Id: I2f7724515cbb7449086611fb79d042ea71d6eb39

commit b1fe6ef7183a846b516740c175a6e835f8126ec2
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Feb 15 10:24:41 2013 -0800

    gralloc: Add TARGET_USES_QCOM_BSP flag for non-AOSP features

     * Also add additional ifdefs for metadata feature.

    Change-Id: Iba1430a34a7123a7bcda3bf89ea2a0deb85fb334

commit 551daf19b5609416095c5ca477d9355d8df0957b
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Feb 14 18:05:18 2013 -0800

    display: Add support for MDP 4.1

     * MDP 4.1 does not support the borderfill pipe and the baselayer logic
       should not be used.
     * Only use 3 pipes for MDP 4.1.

    Change-Id: Ide542079902f35818300619f8eefd3d188342b5d

commit f84b2bcfbdfc93830937ab64832c68c274ae34cf
Author: Rudolf Tammekivi <rtammekivi@gmail.com>
Date:   Thu Jan 24 19:56:42 2013 +0200

    libcopybit: Use CM standard QCOM naming.

    Change-Id: Ide4c8d36743fc23f2711e010a8f031f1bb0b7c6f

commit b655c4ae1c5721a7aae8ea72edaa57c27d7f844c
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Mon Oct 1 16:40:55 2012 +0530

    liboverlay: Use camera heap for targets without mm heap.

    for 7x30 MM heap is not available. Use camera heap instead.

    CRs-fixed: 407303
    Change-Id: Ie94937fb59c40b49d7f5bb30d12b4ddea497a6fc

commit ae45323a50a058b21bbbdb4bd0f1d82bd9faed82
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Fri Oct 5 18:44:05 2012 +0530

    hwcomposer: 7x30: disable overlays for video playback

    check MDP revision and disable overlays for video playback usecase
    on 7x30.

    Change-Id: I8b179512b4aff136834dd80e4da7227a6b2aff4e

commit 0fd638adcaad9f430d2056093d9ee47417abfd8c
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Dec 22 15:34:03 2012 -0800

    overlay: Bring back debug.mdpcomp.maxlayer

     * We're having underrun issues with 4-layer composition. It generally
       works, but when the system CPU ramps down and the device is mostly
       idle, underrun is happening.
     * Limiting to 3 layers solves the problem temporarily on these devices.
     * Readd the option so that the issue can be debugged without afflicting
       our current users with massive amounts of flickering.

    Change-Id: I7ab7d013f65eaf12a3d21a91229dcaad6a815069

commit 17302798ae6a21a07981a87b9d42b96c7ab8a9ec
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Dec 20 21:32:01 2012 -0800

    Update include paths

    Change-Id: I463eb0a6693ec5da41118f132d8dcdb0d11e4be8

commit 0484b4635e00bc191228c77d2a2bef605030e3eb
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Dec 20 20:48:02 2012 -0800

    Only build CAF display variant when requested.

    Change-Id: I273b9e16afa011445e185fdaf1e7cf2f029b077c

commit cfbc2851f89c76f13d7270e3ff342d2e2717b2c0
Author: Shareef Ali <shareefalis@gmail.com>
Date:   Mon Nov 19 20:45:02 2012 -0500

    qcom_display: add TARGET_PROVIDES_LIBLIGHT

    Change-Id: Ifa4984a3dc4b938fb89d6c65c8cda931d643f3c6

commit 98472290e1e832c6f79320a71e72b7d73c24e5e3
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Apr 16 14:12:27 2013 -0400

    copybit: Fix type conversion error for GCC 4.7

    GCC 4.7 has stricter type conversion rules

    Change-Id: I699cfe1ceafb5728fb8e6f34f7b1996d3c812e7e

commit 73c7ea16179bb76b6bc7aabd76d277996e2c9134
Merge: 92b9ef9 991234d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Apr 16 11:18:40 2013 -0700

    Merge "hwc: Reset Layer cache on idle timeout"

commit b519bb243a1537f7420a2e81bbfa91d38d4ae8dc
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Apr 16 10:39:02 2013 -0400

    gralloc: Cleanup usage of old API

    All builds have now moved to the new ION API.

    Change-Id: Ic5ed7aa40231be64c715d6bb0d00a022db3fb863

commit 92b9ef9200e8d9eae38b85b476cec6b9359d01bf
Merge: 8d0c446 ce7b2fe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Apr 15 18:07:02 2013 -0700

    Merge "hwc: Sync for rotator"

commit ce7b2febbcf02e4311db9b2a9613cf0136736d01
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Mar 20 16:58:12 2013 -0700

    hwc: Sync for rotator

    Implement sync for rotator.
    If a buffer is rotated, it can be used by producer soon after
    rotation (and it wont have to wait until vsync).

    Mdp waits for the rotator buffer's release fence to signal
    to start display.

    Hwc waits for previous access to rotator buffer by MDP to finish
    before using it.

    Change-Id: I5664806a17c44d58af62a2825ce454089fcd31cf

commit 991234d247a268cffcf283cb2834f6b180accd7a
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Fri Apr 12 17:09:52 2013 -0400

    hwc: Reset Layer cache on idle timeout

    In the case where MDP composition is possible but we fall back to
    the idle timeout, there is a possibility that all of the layer
    handles that were cached in the _earlier_ idle timeout are the
    same in the _next_ idle timeout. This could cause us to display a
    stale frame. Reset LayerCache in prepare if we are in the idle
    frame.

    Change-Id: I3ab1b0f28044975978a32e082976b038242697d0

commit 8d0c446cd05058818d1e4552f2f63de652324ea8
Merge: 3ddd91a 7f65307
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Apr 12 12:30:00 2013 -0700

    Merge "hwc: Ensure borderfill pipe is setup only after unblank"

commit 7f6530715419a6d9a9004cc4cbb9505799be15b8
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Apr 3 20:54:22 2013 -0400

    hwc: Ensure borderfill pipe is setup only after unblank

    MDP operations should not be done in blank mode. Ensure that the
    borderfill pipe is configured in prepare which happens after
    unblank.

    Change-Id: I97e75ab732015e0f02d12a24af37e4ed86b6b090

commit 3ddd91a9a3e599e98927d990ab45daf8d0f916e0
Merge: 6a777ce 178cddc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Apr 9 05:30:45 2013 -0700

    Merge "liboverlay: round off rotator downscale factor to nearest integer."

commit 178cddc2ef5d97203cc1ba670dcffe15179ad899
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Fri Apr 5 12:19:56 2013 +0530

    liboverlay: round off rotator downscale factor to nearest integer.

    This reduces the MDP clock and bandwidth requirements and
    avoids falling back to GPU composition.

    CRs-fixed: 457295

    Change-Id: I4408ee0485248987342df63669f1a6894ea0dd73

commit 6a777cebcabb0694f5c70d623f6266a6555c44fe
Merge: cfe5267 81ab01c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Apr 8 19:29:48 2013 -0700

    Merge "hwc: Add support for new resolutions"

commit cfe5267c7add0725b694f146b76042cae6659d61
Merge: 5c34c89 e9a5dbc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Apr 8 19:29:48 2013 -0700

    Merge "libexternal: Add support for vesa format"

commit 5c34c89b8d07f7c5d1b630f0a418035c1675cb90
Merge: c6d8f4a 68da95e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Apr 8 16:38:17 2013 -0700

    Merge "libexternal: clean up HDMI modes"

commit c6d8f4a7451aa114993c1062472310299d40ded1
Merge: feeaf5e 9716d1c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Apr 5 13:18:41 2013 -0700

    Merge "libcopybit: protect all c2d copybit API's"

commit feeaf5e9ee2fe85981e4bffae1632e9f68f35a29
Merge: fe86841 7f889a9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Apr 4 14:04:41 2013 -0700

    Merge "hwc: Add DMA pipe support in MDP composition."

commit 9716d1c22b89ed4d2b84f3f442688a54742853b8
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Wed Apr 3 11:25:41 2013 -0700

    libcopybit: protect all c2d copybit API's

    - Each client API exposed by the copybit C2D needs
      to be protected.
    - Add protection for clear_copybit and blit_copybit
    - This is needed as clear_copybit was overriding the
      mapped gpuaddr while copybitwaitthread was waiting
      for transaction to finish and unmap
    - After waitforTimestamp, the new addresses were
      unmapped leading to GPU Page fault

    Change-Id: Ieeac10e73b05d3b47e602b2de4b4e64892737c9c
    CRs-fixed: 470430

commit fe86841f119019b799daf0dc6c8e157bb3373224
Merge: 3653ecd 626dd01
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Apr 3 15:48:11 2013 -0700

    Merge "hwc: clean up overlay on external display blank"

commit 81ab01cc2c9ad919a95037f7bc152a25008c36c3
Author: Ujwal Patel <ujwalp@codeaurora.org>
Date:   Thu Nov 15 18:10:19 2012 -0800

    hwc: Add support for new resolutions

    This change adds support for following resolutions.
    * 2560x1260 @ 60Hz (DVI)
    * 3840x2160 @ 30Hz (HDMI)
    * 3840x2160 @ 25Hz (HDMI)
    * 3840x2160 @ 24Hz (HDMI)
    * 4096x2160 @ 24Hz (HDMI)

    Change-Id: Ibd6fbaf20ac9c9557e738057f2a990eea1de928d

commit e9a5dbc225cb3650d994017786a516c6bb40ad01
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Thu Jan 24 19:48:24 2013 -0800

    libexternal: Add support for vesa format

    This change adds support for 1280x1024@60Hz
    with pixel clock of 108MHz

    Change-Id: Idb2c752554bfb130bba8db2b29444afcacc40fee
    CRs-fixed: 438028

commit 68da95e6746e32085a79a304e644e97ef32a9f5f
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Thu Feb 28 18:47:36 2013 -0800

    libexternal: clean up HDMI modes

    - Userspace was maintaining its own display mode timing table
    - Change that to include the header from kernel

    Change-Id: I19823e60d188b5a30445866c7df1860e269975bc
    CRs-fixed: 470335

commit 3653ecd3115b9e6b0003d94aca265b9426cc6a9c
Merge: 89565f6 1c2e5d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 29 13:32:23 2013 -0700

    Merge "hwc: Add debug logging for fps"

commit 89565f664aefd6d5fc8b61b384f63b922b8e1e27
Merge: 437f6c2 e851193
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 29 11:57:06 2013 -0700

    Merge "hwc: NULL check on buffer handle"

commit 626dd01b8a1a28fa219d5b553dbfbcdf4a16560b
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Thu Mar 28 18:41:06 2013 -0700

    hwc: clean up overlay on external display blank

    - On suspend, SurfaceFlinger calls hwc_blank on primary and
      external separately, inbetween these calls there might be a
      update, which leads to acquiring overlay pipes for external
      which will not be cleared and results in showing up stale
      frame on external display
    - This change clears all the overlay pipes used on every blank

    Change-Id: I44d62b7d0fcd992cf8a26bb0c21df77952bc1381
    CRs-fixed: 464070

commit 1c2e5d3808f71e8d1fbc4e09305381a5fab6e2b5
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Mar 28 14:49:07 2013 -0400

    hwc: Add debug logging for fps

    This is indicative of how many frames are posted to the display
    by SurfaceFlinger. Set debug.gr.calcfps to 1 and restart the
    framework to enable.

    Change-Id: Ic503c14380fd7d8a5b062aa5da0d61bfc3991cb2
    CRs-Fixed: 462010

commit e851193e31ab46c896020278612c92012ade5355
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Mar 26 18:11:41 2013 -0400

    hwc: NULL check on buffer handle

    In some cases it is seen that we receive a NULL handle on
    suspend/resume. One such test case is open browser, suspend
    device, resume device, unlock screen. Since we rely on the handle
    to get the format, make sure it is not null.

    Change-Id: Ia476887a831df33a50b2939a46c143b9c207ea9b

commit 437f6c265c9d69617c20916fe8c1a58cfa86d329
Merge: da9ba6d e6f98be
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 29 00:15:29 2013 -0700

    Merge "display: Use cache invalidate and clean correctly"

commit 7f889a983cb0bae108d87048891d0705c4cd51b3
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Wed Mar 6 18:59:28 2013 -0800

    hwc: Add DMA pipe support in MDP composition.

    This change adds support to MDP composition to use DMA pipes when
    layer scaling is not needed. Also makes sure not to invoke
    MDP rotator when DMA pipes are configured since MDP rotator will
    expect both the DMA pipes to available for performing rotation.
    In such cases, we let the first frame of rotated video frame to
    fall back to FB.

    Change-Id: Icf9dbd55bcc516335a8c9ede5ed0498fdd08a929

commit e6f98bee0f04109c66d0f21b8ed9aa274e0c408c
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Mar 20 21:01:19 2013 -0400

    display: Use cache invalidate and clean correctly

    Make sure cache is invalidated before reading in software and
    cleaned after writing in software.

    Change-Id: I91c471c47a5f1ff11f9960f08091a17ffe575534

commit da9ba6d9e6e4ba5fa010cdb159886fc14515e8e0
Merge: 2eeee4f 0be6eac
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 26 16:15:44 2013 -0700

    Merge "hwc: Configure pipe for FB even if we exceed max layers"

commit 2eeee4fc4546967378fd97679c387cab3b1d5c71
Merge: f1cb1c0 e129e66
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 26 14:45:57 2013 -0700

    Merge "overlay: Use correct downscale for rotator."

commit f1cb1c00cc92acc391d4f104bbf92ea432c7d620
Merge: 01ddf6f d5c404b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 26 14:45:53 2013 -0700

    Merge "hwc: Configure FbUpdate only when needed"

commit 01ddf6f07a358c9210a640ac21155435c1fab5a0
Merge: e31edd0 752f4b0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 26 14:45:49 2013 -0700

    Merge "libcopybit: Remove usage of C2D_NO_BILINEAR_BIT"

commit e31edd001926160dcc3eb627a48c4ecab417d10c
Merge: 3559805 2d01bb5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 26 14:45:42 2013 -0700

    Merge "libexternal: disable HPD during initialization."

commit 0be6eacbd72a4ff03a1eb0d64c98adaaa71e7e65
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Fri Mar 22 11:29:44 2013 -0700

    hwc: Configure pipe for FB even if we exceed max layers

    Even if we exceed max supported layers, configure pipe for FB
    Because FB contents are always displayed using hwc

    Also some minor code fixes

    Change-Id: I740ab7e908c916373b1d87facd831e09098ce753

commit 35598052f5abf16805563f93b0ebdeccae2cbf1f
Merge: fb65ca6 5704a5b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Mar 25 19:15:48 2013 -0700

    Merge "libcopybit: Use blending parameters passed by HWC"

commit e129e660aa7efd2b7d6d9ff32d790e45be8f1c6a
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Mar 19 15:45:24 2013 -0700

    overlay: Use correct downscale for rotator.

    Downscale is calculated based on area of dst and src.
    Apply sqrt of downscale to each dimension.

    Change-Id: I9def4ea5073e0e49a05103505a6b6f5013f0d579

commit 5704a5b6871f349facccdc2cb6e65bc036862ce4
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Thu Mar 21 20:10:25 2013 -0700

    libcopybit: Use blending parameters passed by HWC

    Instead of assuming the premultiplied alpha based on the color
    format, use the blending parameter passed by the HWC.

    Change-Id: Ib494644b6f9c4bf13d8ea28327ccc2058a52aae8
    CRs-fixed: 466732

commit fb65ca6294610e28210c386f722f22f8e3fd1149
Merge: 868102c 6e06654
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 22 19:56:24 2013 -0700

    Merge "hwc: fix dst calculations for right mixer"

commit d5c404b64e6c335e6c6352bcc977c5ebc0448006
Author: Sravan Kumar D.V.N <sravank1@codeaurora.org>
Date:   Fri Mar 22 06:20:04 2013 +0530

    hwc: Configure FbUpdate only when needed

    When video overlay is on and there are no UI layers to compose,
    there is no need to configure for framebuffer target.

    If framebuffer target is  also configured in such cases, video is not
    shown on display due to 0 z-order.

    Change-Id: I468068fa3a273d61e3688014251043035353cec0

commit 868102c809cb8d047a6584f4fe1c2bf41886d0f7
Merge: 35251ff e3671d1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 22 15:16:35 2013 -0700

    Merge "libqservice: Change the permission for SCREEN_REFRESH"

commit 35251ff0529386a11f8d51ec8f30ad0f94fb7d1f
Merge: be8db35 77f89be
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 22 15:16:31 2013 -0700

    Merge "gralloc: Align protected allocations with the spec"

commit be8db355fe0d7218ca931cfeae92f155447f5de9
Merge: bb2f953 737a536
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 22 15:16:26 2013 -0700

    Merge "hwc: Check vsync state before sending it up"

commit 2d01bb53ceae271c1622a595a68db72a6f5ae18d
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Wed Mar 20 15:56:15 2013 -0700

    libexternal: disable HPD during initialization.

    - Disable HPD at start, it will be enabled later
      when the display is powered on
    - This fixes the issue where the HDMI mirroring
      was not working when there was a framework reboot
      or adb shell stop/start

    Change-Id: I56d706ebae281297a8ec6517a4fb8e5cdda27617
    CRs-fixed: 461820

commit 6e0665490d72c79dcbaf3d4e45b1d3838f7f270e
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Mon Mar 18 17:31:50 2013 -0700

    hwc: fix dst calculations for right mixer

    The calculations made for the right mixer was not correct,
    fixed it for both FBUpdate and video usecases

    Change-Id: Iff2c296321bce14b776731528fff6f1d255d829a

commit 737a5363a66bf0e2aec2595dce9d2af71bef7697
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Fri Mar 15 21:31:54 2013 -0400

    hwc: Check vsync state before sending it up

    The vsync enable ioctl is called in  a separate thread in a
    recent change
    Hence it was now possible that vsync could be disabled but
    SurfaceFlinger still received a vsync. With this check we make
    sure that doesn't happen.

    Change-Id: I459c0b98ab9ce972d86a361c5ecdfe0c1a2d0e74

commit bb2f953b2a6aa0b83c26a6ae6c03c6cef00d72c6
Merge: 460c19f eacb117
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 21 16:16:03 2013 -0700

    Merge "hwc: Add support for clearing with c2d"

commit 460c19fe6dddf9d5c84ef1d6c717a39780b1e117
Merge: d1cff68 909a598
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 21 16:15:59 2013 -0700

    Merge "hwc: Fix alpha downscale check for mdp composition"

commit eacb117e3ccae9181a3032f388ba11e6007468be
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Mar 14 20:44:17 2013 -0400

    hwc: Add support for clearing with c2d

    When blending translucent layers or transitioning with c2d,
    sometimes the frame is blended with stale framebuffer content.
    Clear the frame with C2D fill surface before drawing.

    CRs-fixed: 462461
    Change-Id: I1dca477fe88d77f4f0fa4846b155404f348e911d

commit d1cff6875e8e65c00622b2b9e635e804b5cbb22a
Merge: bfdd333 1a17f11
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 21 10:27:24 2013 -0700

    Merge "libhwcomposer: add dynamic thresold support for copybit."

commit e3671d1346ce2b493a696aeb501946e844287013
Author: Ping Li <quicpingli@codeaurora.org>
Date:   Mon Mar 18 13:24:07 2013 -0400

    libqservice: Change the permission for SCREEN_REFRESH

    Change the SCREEN_REFRESH permission from AID_GRAPHICS to AID_SYSTEM.

    Change-Id: I8d732282df481695d8241e3087725784825b756d

commit bfdd3333048e08781efb90d6896aabbbbbc590d1
Merge: 66bac9d a762b96
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 21 00:34:35 2013 -0700

    Merge "qdutils: Retrieve MDP revision and pipes information from driver."

commit 66bac9d0f50ebb81c460bd67bba110b2c1efed35
Merge: 1358722 27e944f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 20 18:24:17 2013 -0700

    Merge "display: Remove framebuffer HAL usage"

commit 77f89bea0145f67588ca95b2f55c52b393f70f60
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Mar 7 13:42:20 2013 -0500

    gralloc: Align protected allocations with the spec

    The specification for GRALLOC_USAGE_PROTECTED indicates that
    allocations with that flag must be protected by securing with
    hardware. If such protection is not possible, the buffer must not
    be composited. In our current software only the MM_HEAP is
    secured. If we allocate protected buffers from any other heap we
    block those from being displayed.

    CRs-fixed: 465012
    Change-Id: I9d47aba3d28192db3fcc394fd6b38efe42ae118b

commit 1358722dc2136fe0014579066ce8a6fb61ae60a1
Merge: 1fdf133 924a7b1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 20 15:55:28 2013 -0700

    Merge "gralloc: Stride information fix"

commit 1fdf133289574c3313fc3528aa16299ec11769a0
Merge: 697be25 6ff67bb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 20 14:11:26 2013 -0700

    Merge "hwc/ov: Fix MDP orientation flags and values."

commit 27e944f0d89451bb3ed7ecaea1b180234db26a28
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Wed Feb 20 18:32:01 2013 -0800

    display: Remove framebuffer HAL usage

    This patch removes the usage of the framebuffer HAL which is
    deprecated in JB MR1 onwards. The code is left for compatibility
    such as conformance tests but it is unused for normal display
    usage.

    Change-Id: If98133bdaa759cdc41d4503ff695b225ee43cb6f

commit 924a7b19da13dee5c43f7e8537042937fbe962ae
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Mon Mar 18 11:46:24 2013 -0400

    gralloc: Stride information fix

    The perform enum for the stride is defined in gralloc_priv so it
    is OK to keep the case outside.

    Change-Id: Id31556f76c2a2ae93a15a2e2dc4169b07360e4e6

commit 752f4b01dbf9296dbd301021cd133b494a9a5405
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Wed Mar 20 11:42:53 2013 -0700

    libcopybit: Remove usage of C2D_NO_BILINEAR_BIT

    Remove usage of C2D_NO_BILINEAR_BIT in the config mask.
    This enables using the BILINEAR filter for scaling and
    improves the image quality

    Change-Id: Ic9b61fe3ed5b16e63971fe542928640a13d92764
    CRs-fixed: 453925

commit 909a598afb58b86240697b63793fae4548c82ada
Author: Sravan Kumar D.V.N <sravank1@codeaurora.org>
Date:   Wed Mar 20 05:22:26 2013 +0530

    hwc: Fix alpha downscale check for mdp composition

    Do not allow mdp composition when any layer format has alpha channel
    and needs scaling as the VG pipes are not supporting alpha downscaling.

    In few scenarios, at the beginning/ending of animations Surface Flinger
    passes few frames with flag HWC_BLENDING_NONE though it has Alpha.
    When such layer passed to VG piple and if needs scaling , it results in
    flicker. Hence, just checking for HWC_BLENDING_NONE is not enough.

    Change-Id: I70fdfe4547df6fe7b2771ed8042f43aa4e07a71d
    CRs-fixed: 462508

commit 6ff67bbcab0bd88b2bfd90b87dd0e14d0580cf1c
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Thu Mar 14 14:45:38 2013 -0700

    hwc/ov: Fix MDP orientation flags and values.

    --Fix MDP_SOURCE_ROTATED_90 removal.
    Since mdp flags are updated fresh each round,
    this flag should not be removed if there is no 90.
    If pre-rotation is used, this flag is set by hwc and removed here.
    (Affects anything having a 90 component in transform)

    --Provide MDP adjusted transform to prerotation calcs.
    Clients on Android don't switch flips if 90 component is present,
    but expect the output to be that way. (camera)
    We do it in HAL and then calculate final crop for MDP.
    (Affects anything using 90 + Just 1 flip i.e camera)

    --Pass 0 transform to MDP even for flips, since we
    prerotate if there is 90 with flips or use MDP to flip via flags,
    so no need to flip transform calcs.
    (Affects anything using just flips).

    Change-Id: I115a82ee4558794db0b6b641710494b9007d6f54

commit 697be257c1097b86f6e4ea4a8f76addeb2f6172c
Merge: 8f4f4f1 2c6e0cf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 19 21:08:46 2013 -0700

    Merge "hwc: qclient: Subscribe to mediaplayer death later."

commit 2c6e0cf6811023eae63ba5ce5427ea8855ed0a9f
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Fri Mar 15 16:49:50 2013 -0700

    hwc: qclient: Subscribe to mediaplayer death later.

    Subscribing to mediaplayer death on bootup delays
    display startup because it depends on mediaplayer startup.
    Defer until later.

    CRs-fixed: 463863
    Change-Id: I5a5fc392b88fd06f51521f9e4c06feb52a5af7c6

commit 8f4f4f19d56045bdebf72a7543e8d3c47c3e4196
Merge: b9d3db0 4d87dc2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 19 12:54:55 2013 -0700

    Merge "hwc: Processing of HDMI connection request when WFD is active"

commit 1a17f1149317686723dc0c556e616953128eb8e1
Author: Prabhanjan Kandula <pkandula@codeaurora.org>
Date:   Fri Mar 15 22:33:39 2013 +0530

    libhwcomposer: add dynamic thresold support for copybit.

    copybit blit may not be effective if data for composition
    is high. Add configurable threshold support beyond which
    we can avoid copybit blit. set default threshold value to
    2 times of fb resolution.

    CRs-fixed: 462450

    Change-Id: I0ee77ea1d761dc370d82ade1724caefbecfa01f5

commit b9d3db08670fb450b2725c9766241fe756c34df8
Merge: 6e38e57 8c0b01b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Mar 18 18:26:05 2013 -0700

    Merge "hwc: Use correct z-order in video overlay"

commit a762b966af0b3387694ba8a54c0f23a7720bf6c6
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Wed Mar 6 15:36:49 2013 -0800

    qdutils: Retrieve MDP revision and pipes information from driver.

    Userspace can retrieve MDP revision number and number of different
    types of MDP pipes (RGB,VG,DMA) information from driver. Add target
    specific flag as previous MDP versions do not provide this support.

    - Make use of this information while maintaining PipeBook.
    - Move PipeBook related functions from overlay utils to PipeBook.

    Change-Id: I46578bb27e515c4b9525d90b6619c11d7749914f

commit 8c0b01b5268d2428d8611f6ad2c583995a31dee2
Author: Sravan Kumar D.V.N <sravank1@codeaurora.org>
Date:   Fri Mar 15 08:51:16 2013 +0530

    hwc: Use correct z-order in video overlay

    Set z-order of video layer to 0 and framebuffer to 1 in case
    of video overlay composition so that the blending takes effect.
    Also set is_fg OFF for framebuffer.

    Change-Id: I05f930074d265d690f29a1003b7c28077df89bbf
    CRs-fixed: 458180

commit 4d87dc2fdf06fc28fb8172ae5cb583bccff7bcb4
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Thu Feb 7 16:42:50 2013 -0800

    hwc: Processing of HDMI connection request when WFD is active

      when HDMI is connected during active WFD session, teardown
      WFD and process HDMI connection request.

    CRs-Fixed: 442226
    Change-Id: I4b22ff9f1ab3175bab47babdaf040cb2289ebe4d

commit 6e38e57290645f2cd2e036dcd3d105d3d940f403
Merge: 27c04a0 36b9bbe
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 13 19:46:21 2013 -0700

    Merge "gralloc: Override gralloc calculated size only if bufferSize is greater."

commit 27c04a0493aab0fefd349ca2831424f946b033ca
Merge: 48f3cbe 9d4358b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 13 16:26:07 2013 -0700

    Merge "hwc/overlay: Video on 4k2k external, 4k2k rotation."

commit 36b9bbece24359f77cdf86d0ed1e962476f25387
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Tue Mar 5 14:14:24 2013 -0800

    gralloc: Override gralloc calculated size only if bufferSize is greater.

    bufferSize set using native window set buffer size will override gralloc
    calculated size only if bufferSize is greater.
    Fix for 720P, 1080P HD content playback is not working on 7x27A due to
    buffer size mismatch between requested size by frameworks and allocated
    size by gralloc for HAL_PIXEL_FORMAT_YCrCb_420_SP and
    HAL_PIXEL_FORMAT_YCrCb_420_SP format

    Change-Id: I16d04e406ab8f1f35e0e0a70e19d99a019adc5ef
    CRs-Fixed: 451783

commit 48f3cbe11b2c3b0e26e967d141a489101cec11cf
Merge: 53973c6 037b1e1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 13 14:38:17 2013 -0700

    Merge "hwc: Handle WFD Pause/Resume usecase"

commit 9d4358be3845cb0f17a66be8e313adfe317f8a7e
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Feb 26 10:15:15 2013 -0800

    hwc/overlay: Video on 4k2k external, 4k2k rotation.

    -Add support for Video via overlay on 4k2k external panel.
    -Add support for rotating videos on 4k2k panels. We use
    pre-rotation in hwc to rotate a video into a single buffer,
    irrespective of panel size. Then this buffer is fed to MDP.
    Rotator objects are managed by the new RotMgr.
    -Cleaup mdpcomp and overlay.

    Change-Id: Ifb08534747e8e18b6c58dd8a3e1a9947409100f1

commit 53973c63ca20061973737add388dcb581cc949ce
Merge: 17641a5 bdcf348
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 12 13:16:01 2013 -0700

    Merge "display: Remove genlock usage"

commit bdcf348cf444f018f883777e97008d1710833cce
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Feb 12 14:53:33 2013 -0500

    display: Remove genlock usage

    genlock is no-op from Android 4.2 onwards since the sync framework
    is used for explicit synchronization.

    Change-Id: Idd1df589516534a683e0fa1ef0cfbb7f0e411f67

commit 17641a5e47d9be723c88782c66c619caf7fed9ea
Merge: 9fcb487 59e090a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 7 10:55:35 2013 -0800

    Merge "gralloc: Fix incorrect flag usage on old ion API"

commit 9fcb487097d8c16e95e056e7441df2d02c8d4c32
Merge: 9993a4e 5aa54f0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 7 10:55:32 2013 -0800

    Merge "hwc: Check for correct screen state before enabling vsync"

commit 9993a4e0362caabcbde088633a89e083ba7408a7
Merge: e25c256 e0dff93
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 7 10:55:28 2013 -0800

    Merge "overlay: Reset allocation on all pipes, if commit fails."

commit 5aa54f0a65dc01bbb3d57fb2421393c39beca7b9
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Mar 5 11:34:14 2013 -0500

    hwc: Check for correct screen state before enabling vsync

    Sometimes vsync would not be disabled before the display is
    blanked.
    This was due to the vsync disable ioctl being kicked off in a
    thread different from the event control which surfaceflinger
    called. So, while the calls from surfaceflinger are in order, the
    order of execution wasn't always the same. Hence, making sure
    ioctls are called in the same context to ensure order.

    Also
    - Make blanking/unblanking logs show the operation as a string.
    - Add a debug property to dump vsync timestamps (needs framework
    reboot)
    - Remove a log which showed delay in reading vsync. This log was
    unreliable when vsync is disabled and we're still reading from
    the sysfs node.

    Change-Id: Ibec04e9ffebd0ac6e1d32b7031e3668abd9390ff
    CRs-fixed: 443113

commit e25c2562c699ce01bae937113e0b8d2b0c2a7aa1
Merge: 2075047 6b93e3a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 23:07:30 2013 -0800

    Merge "hwc: handle blank/unblank for virtual display explicitly."

commit e0dff93772852824f08a4e3ca3f5af7440c7a7e2
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Fri Mar 1 14:33:18 2013 -0800

    overlay: Reset allocation on all pipes, if commit fails.

    If commit fails on a pipe, overlay hal needs to reset allocation
    on all pipes for the given display. As MDP Comp fails, it falls
    back to video and PipeBook logic does not pick-up those pipes on
    which commit was successful. Driver sets new pipes and un-stages
    previously set pipes (with same z-order). Pipe clean-up happens
    and then in next round, PipeBook logic picks-up previous pipes
    hence userspcae and driver remain out of sync.

    Change-Id: I963fbdf89f346184688c5bcac2824606a5f7a0f2

commit 59e090aadbb5d6f22d18ee0caee2d6273ae07778
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Mar 5 21:17:29 2013 -0500

    gralloc: Fix incorrect flag usage on old ion API

    The secure flag gets sent only with the new ION API

    Change-Id: Ia649500474b0c8384f4b45d599fcff54644005aa

commit 207504796353fc53c5fbefdd87152bb073419570
Merge: 8e125fb c59aa2f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 17:47:33 2013 -0800

    Merge "hwc: Process only MAX_NUM_LAYERS"

commit 8e125fba7d3c13733d44d536ac09c7abc82fa1c6
Merge: 82d2341 69d9585
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 17:47:28 2013 -0800

    Merge "display: Add hook for triggering screen update"

commit 82d234154183ccd4a813f59a88fa86cd6c544bac
Merge: 25dbddf d6453ae
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 17:47:07 2013 -0800

    Merge "gralloc: Allow IOMMU memory to be uncached"

commit c59aa2f727a4897627cdf918bce1936c03980a18
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Feb 26 13:38:05 2013 -0800

    hwc: Process only MAX_NUM_LAYERS

    If the incoming layer count exceeds MAX_NUM_LAYERS,
    let surfaceflinger handle the list.

    CRs-fixed: 456906
    Change-Id: I53159104e5e714ba313d0196ca959f55c82e18ae

commit 25dbddf5ce532f6e3a6d8a3b4c170a281999c261
Merge: e9ccee9 587b0da
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 11:06:03 2013 -0800

    Merge "libexternal: prefix the property name with hw"

commit e9ccee9c129e4ede95637fd88dcfd5f21d922e8f
Merge: db770e2 64b8121
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 09:36:20 2013 -0800

    Merge "hwc: Use intermediate buffers for copybit"

commit 6b93e3a57527865ae59279adfad84971e78f3320
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Tue Feb 26 10:48:05 2013 -0800

    hwc: handle blank/unblank for virtual display explicitly.

    Surfaceflinger does not send Blank/unblank event to hwc for virtual
    display, handle it explicitly when blank for primary is invoked, so
    that any pipes unset gets committed.

    Change-Id: Iec7a1611a8963408f65c8a73a1c15e47cd7faab6
    CRs-Fixed: 456810

commit 64b8121562eb12d6e90faa4f00715063d7e18f18
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Feb 14 10:29:47 2013 -0500

    hwc: Use intermediate buffers for copybit

    The earlier copybit solution involved blitting directly into
    the SurfaceFlinger's framebuffer target. That solution involved
    unnecessary framework changes and caused issues when the
    framebuffer was being written to both by GL and copybit.
    Update hwc_copybit to use our own buffers for this purpose.
    We also make sure we display only the region we're interested in
    so that unnecessary artifacts from previous blits do not show up
    on the display. This way, we can avoid clearing the intermediate
    buffers every frame.

    Change-Id: I713b3fc606e0768444c621af76853ece41964da1

commit db770e203fa1e721a661d66e6521bc992db3edb8
Merge: edddf92 b551ce4
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 1 03:15:17 2013 -0800

    Merge "libhwcomposer: MDP composition for Higher Resolution panels"

commit 69d9585d56154e10cda466d3b87169895ecf56a3
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Thu Feb 28 10:45:56 2013 -0800

    display: Add hook for triggering screen update

    DSI command mode panels do not need to be refreshed on each
    vsync. Due to one frame latency in CABL LUT calculation, when CABL is
    enabled for DSI command mode panels, the LUT doesnt get updated for last
    frame. Triggering an extra update for DSI command mode panels fixes it.

    Change-Id: I7a22e338609430746dda4d3081ff199109a95035

commit d6453ae290be7b6bca34a122c461ecfcf4352834
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Feb 28 10:46:14 2013 -0500

    gralloc: Allow IOMMU memory to be uncached

    The IOMMU heap can give us uncached memory, so remove this
    erroneous check.

    Change-Id: Ie141c55821221a1c2f75b7cf2248794d93ea6c6a

commit edddf92aabdcbcd7b2777ea182f130ae0b86864e
Merge: d477cd5 747af1e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Feb 28 03:48:20 2013 -0800

    Merge "hwc: Close acquireFenceFds always."

commit d477cd540070c6d4a46fd09664fe1121ace8e5ba
Merge: 93dfb3a b2fc956
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 27 02:42:02 2013 -0800

    Merge "libcopybit: update the target config_mask for transformation"

commit b551ce4ed2984ef2dfbe255d2089764ba7d06b7f
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Thu Jan 10 16:26:48 2013 -0800

    libhwcomposer: MDP composition for Higher Resolution panels

    This patch:
           -Implements MDP composition for higher resolution
            panels of width more than 2k.
           -Adds DMA pipe support for high res. MDP composition

    Change-Id: Ib7b1f822e3600eca81521294fedfe05e948b65c3

commit 747af1e9e1bf1f7793a2ac5babda460bf4fab5a5
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Feb 26 10:25:12 2013 -0800

    hwc: Close acquireFenceFds always.

    Close acquireFenceFds always even in case of failures if a layer is either
    OVERLAY or FRAMEBUFFER_TARGET to prevent leaks in case of failures.
    The framework is *not* responsible for closing acquire fds, for layers
    marked as above two.

    Change-Id: Ia6c751d3ec25f196f5503120894fc6cc692b9d25

commit 037b1e1a4e7ff914280d97758b11bff5e09096a6
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Thu Feb 14 16:14:33 2013 -0800

    hwc: Handle WFD Pause/Resume usecase

    During Pause event, set external pending state, there by
    allowing frames to fall back to FB, closing all MDP pipes.
    Resume event should be considered as a connect event.

    Change-Id: I536ab9df7145bbb9081edd01168d3dcbc332f07e
    CRs-Fixed: 452380

commit 93dfb3aa6293965aed0f7a614eabe9b61907ed5e
Merge: 9bd380d 7128e50
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 26 07:29:41 2013 -0800

    Merge "hwc: Get notified on media player death."

commit 9bd380dfacff38c42c24b864e7ee3e8437913482
Merge: e8224c1 11a380d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 26 07:29:37 2013 -0800

    Merge "hwc: Allow HWC to support Virtual Display"

commit 587b0da167e27be17567b6433c336c0ea5b490ab
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Mon Feb 25 17:47:42 2013 -0800

    libexternal: prefix the property name with hw

    System property to be shared with the applications, they need
    to have same UID.
    Prefix the system property with "hw." so that it can be of system
    UID and be accessed by any app.

    Change-Id: Ie5db1b7e614728c53e1085089194cd8a58f9ae63
    CRs-fixed: 456480

commit b2fc956ee66f51e47898b307e519bdc4634f566e
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Mon Feb 25 16:28:51 2013 -0800

    libcopybit: update the target config_mask for transformation

    With the new C2D optimization, the layer transformation is
    passed through the config_mask.  If two layers had same
    transform then the transform info was lost, fix that by
    updating the config_mask when the layer has transformation info

    Change-Id: Idecb5b16a65269fd13eead9a2de27a4756435583
    CRs-fixed: 453083

commit 11a380df087094ecfa07f47eef140592658f5779
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Thu Jan 17 09:30:56 2013 -0800

    hwc: Allow HWC to support Virtual Display

      This change allows virtual display to be composed
      by HWC for supporting Google WFD App + QCOM WFD stack.

    Change-Id: If8892230256e72fa34e3fb5ae715c3ad8cbd5b64

commit e8224c192d121f7f6fd3f11f0c215885492a4b3e
Merge: b6472c2 fc3652f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Feb 21 16:00:06 2013 -0800

    Merge "overlay: Fix rotator output buffer size."

commit b6472c2d7652d5ebcfb010af83fdeb914268e030
Merge: 3a660a7 0d0a7cb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Feb 21 15:59:18 2013 -0800

    Merge "overlay: Add support for pipe dumps."

commit 0d0a7cbdd8c0a785c970f234b94b0cd84bc8b7f4
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Feb 12 17:58:19 2013 -0800

    overlay: Add support for pipe dumps.

    Add support for pipe state dump useful in dumpsys.
    Reduce debug log spam when mdp state changes.

    Change-Id: Ie27ad00698085e2ffd6166ad2f7503fe16a571f8

commit 3a660a70376870edbb3804cf5af58df1c6ae6a8b
Merge: 6ff05f7 f53b377
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 20 21:36:50 2013 -0800

    Merge "display: Close 0 fds"

commit 6ff05f704895ce4801e0d72fde3d362fe737cfe7
Merge: 1eeabd5 4ca8f3a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 20 21:36:46 2013 -0800

    Merge "display: Do not align down input rotator src height"

commit 7128e50faef935900153229f87874aca4c41cff6
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Feb 20 13:24:48 2013 -0800

    hwc: Get notified on media player death.

    Add support to get notified of media player death.
    This is useful in reseting secure sessions initiated by mediaserver.

    Change-Id: I215b5b552a0874c86a07426cd7d16ed48f307b5d

commit 1eeabd558c4384ed5c55ea282d3dd8cf1108051d
Merge: d80b718 01f5c8e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 20 08:18:23 2013 -0800

    Merge "libgralloc: Get the stride information from libadreno_utils.so"

commit 4ca8f3aa9a3716b4827ca11e322078a36d029a3a
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Thu Feb 14 18:56:50 2013 -0800

    display: Do not align down input rotator src height

    Aligning down the input rotator source height value introduces
    green line in the output of the rotator. Remove aligning down the
    input rotator source height for YV12 format.
    For 1/8th downscale use aligndown instead of alignup.

    Change-Id: I9152ee873c5ee79877653c78f33eb0cf7e2f9871
    CRs-Fixed: 453033

commit fc3652f2c70e5548b8011b6a1a608126b92e6ff2
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Fri Feb 15 13:15:45 2013 -0800

    overlay: Fix rotator output buffer size.

    Fix rotator output buffer size for mdp and mdss rotators.
    Output size is based on rotated width & height.
    Output format can be different than source format.
    It could be same if using mdss rot or using fastyuv mode in mdp rot.
    Deprecate the static mapping of rotator input and output formats.
    Driver will be responsible for correctly populating the dest format that its
    wishes to use.

    Change-Id: I17352d6d460cac24eb97083aed38668929c66807

commit 01f5c8eacb67de662f17069589592f5f79cab241
Author: Naomi Luis <nluis@codeaurora.org>
Date:   Mon Feb 11 12:46:24 2013 -0800

    libgralloc: Get the stride information from libadreno_utils.so

    libadreno_utils.so is an adreno utility library. It computes the
    optimal stride required for a surface of a particular width and
    bpp. Using this computed stride allows us to efficiently use the
    dual memory channels and increase performance.
    Currently the utility library only computes the optimal stride
    for RGB surfaces.

    Change-Id: I0f70bd11602a5144515ab07c3bd2b80a01586a06

commit f53b377bde70eb4a28acb27713c17a855ef42495
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Fri Feb 15 19:13:50 2013 -0500

    display: Close 0 fds

    0 can be a valid file descriptor, make sure 0 fds are closed

    Change-Id: I2bf2280d70eda74fa0b0a886ea54ecefc6854b24

commit d80b718ec1ef9f517dd83a247add59ca32c59110
Merge: d8cfc69 501cf7b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 15 14:26:05 2013 -0800

    Merge "qdutils: Default to GPU composition"

commit d8cfc69897e087df250a9526eab3c7c971edd826
Merge: fccd364 a44100c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 15 14:26:02 2013 -0800

    Merge "libgralloc: Add Perform function to get the stride."

commit fccd364384788a09b98951bdd39f421cfa3649e5
Merge: f912294 86c1729
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 15 14:25:58 2013 -0800

    Merge "libqservice: Add a client interface."

commit f912294e622a59d3e31932a6b3500014cdc37bdd
Merge: 91dae25 69f2bb2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 15 14:25:50 2013 -0800

    Merge "libhwcomposer: Only 4 pipes can be used per display for MDP Comp."

commit 86c1729e75df4009f9d773672579e074cc53f889
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Fri Feb 8 15:24:13 2013 -0800

    libqservice: Add a client interface.

    Add a client interface which interfaces with hwc.
    qservice upon receiving IPC, provides a callback notification to the qclient
    which does appropriate stuff in hwc.

    In future, qservice can safely be even made a separate process with no changes
    to exisiting code. This was not true earlier owing to the hwc pointer held by
    qservice forcing it to be in the same process that hwc is in.

    CRs-fixed: 452977
    Change-Id: I05838c213f5d4606a6573693de1bacbc5876107e

commit 91dae25d49c3da2f628ee5b0ca4a1e86b31eaefd
Merge: ef3efaf 24f2005
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Feb 14 15:56:26 2013 -0800

    Merge "hwc: Log if vsync read takes more than 2 expected vsyncs"

commit 501cf7b6ad5d26f85785912d2e0f162cc6360758
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Feb 13 16:33:40 2013 -0500

    qdutils: Default to GPU composition

    If composition type is not set, default to GPU composition.
    This is because CPU composition is not supported from MR1 onwards

    Change-Id: I951dcb5586a8dbcfbe73cd7292d0f1690d6528ba

commit a44100cafc1062a725f2bba809b56846f21c8952
Author: Naomi Luis <nluis@codeaurora.org>
Date:   Fri Feb 8 12:42:03 2013 -0800

    libgralloc: Add Perform function to get the stride.

    - Introduce a new class to Get the Adreno computed stride information.
    This class has been added to allow adreno library computed strides to
    be propagated to the allocation function as well as those clients
    requesting it.
    - Add a new Perform function to get the stride. The width and the format
    can be passed from the calling functions (like EGL) to get the stride of
    the buffer.

    Change-Id: I4c2b4a02deff327f0ea5558c478997527fe9d3cf

commit 69f2bb260e2f5b1ceaebd45ec220ac1ac5feede5
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Wed Feb 13 10:50:47 2013 -0800

    libhwcomposer: Only 4 pipes can be used per display for MDP Comp.

    Although 6 pipes are available in total but only up to 4 pipes are
    available per display (single mixer) for MDP Composition.

    CRs-Fixed: 450985

    Change-Id: I99df91ab955a1a7110dfbea2aaf790ba26058a78

commit ef3efafaed54ff5a52f661720524c4a9f06b774f
Merge: 961407f 23f69b2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 13 10:16:53 2013 -0800

    Merge "liboverlay: Set mdp src format as rotator output format."

commit 961407fe4136939c986f9c8d980ab3de9a15f027
Merge: c4ba968 7421472
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 13 10:16:51 2013 -0800

    Merge "display: Reconcile display HALs"

commit 24f20059ecb11bfaf8d6f078a04e413fd263a6d5
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Feb 13 11:47:25 2013 -0500

    hwc: Log if vsync read takes more than 2 expected vsyncs

    Change-Id: Id1daffa9d1d3521f42d121634bf5b00757f3609f

commit c4ba9680b077efb26e01e8e7e5d2be4b00eb2658
Merge: 586ccdc b4d184f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 13 05:47:57 2013 -0800

    Merge "liboverlay: Fix stride alignment issue for s/w decoded video."

commit b4d184f102a91055b2403b9a64d0bed1b831fdd4
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Mon Feb 11 16:13:10 2013 -0800

    liboverlay: Fix stride alignment issue for s/w decoded video.

    1. Due to alignment requirements on HAL_PIXEL_FORMAT_YV12 format,
    rotator buffer size calculation needs to be performed based on
    rotated width and height because buffer size can be different when
    width & height are swapped due to 90 degree rotation.

    2. Input and output color formats are same for MDSS Rotator.

    Change-Id: I0a06ef9bb7bdceb951e7ab5160dac3e92a28bcda
    CRs-Fixed: 451871

commit 586ccdce6c3970483e1ab30541e7b0eda5f32518
Merge: 87293b7 d81f9e8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 10:07:50 2013 -0800

    Merge "overlay: Remove unnecessary lock."

commit 87293b70bef9a5010569efef3bb9b603ae0d7f5e
Merge: 7f29ba1 4333330
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 10:07:47 2013 -0800

    Merge "hwc: Call MSMFB_DISPLAY_COMMIT even if FB handle is null."

commit 7f29ba13b3147220145fbb82cf8ff4927f6587bf
Merge: d46feac c18dbc2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 10:07:44 2013 -0800

    Merge "hwc: Don't use MDP for buffers of width less than 5"

commit d46feac0cb37ec3eb1224fdabef0ac340533a99f
Merge: c645920 4b9784e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 10:07:40 2013 -0800

    Merge "gralloc: Do not set ION_SECURE for non-contiguous heaps"

commit c645920d486b65d9884ba9daa4ea3a0480041929
Merge: 90f8b98 7535aba
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 10:07:22 2013 -0800

    Merge "libhwcomposer: Don't count video layers marked for SKIP"

commit 90f8b987317ae7ff8d4b1824289535a1aeff6286
Merge: e4d9fd2 e1cea3e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 10:07:03 2013 -0800

    Merge "libexternal: change the order of ioctl call for HDMI"

commit e4d9fd29a57c5fc2d2cd9ec95922f6bc759d6e5f
Merge: 73d36df feb2d8a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 10:07:00 2013 -0800

    Merge "display: Add support for overscan compensation for ext display"

commit 23f69b29e48bca0cc14514e03b94dd0fe7954c1a
Author: Raj kamal <rkamal@codeaurora.org>
Date:   Sat Nov 17 00:20:55 2012 +0530

    liboverlay: Set mdp src format as rotator output format.

    * Set mdp source format as rotator output format
    rather than determine it from a fixed mapping of
    input/output formats.

    * This is needed since for the same input format
    to rotator, fastyuv mode if enabled may result in
    a different output format than the one if the mode
    is not enabled.

    * Do the inline optimization for rotator where possible

    CRs-fixed: 451064
    Change-Id: If0bb2f3a44df10968383ab3f5c3625257518934d

commit c18dbc2a3de977440ab054a63a10bc6f5dade8aa
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Fri Feb 8 14:29:44 2013 -0800

    hwc: Don't use MDP for buffers of width less than 5

    This is a software workaround for MDP hardware limitation where
    DSI mode panels wont give more than 30 FPS if buffers in RGB
    pipes are of width less than 5

    MDP can't handle layers of width less than 3. Fail MDP
    Composition for those frames.

    Change-Id: If45efab19817ea9e724fd2857fcc1c5d98ce0eab

commit 73d36df6852e7d350be6a923033252b194871280
Author: Duy Truong <dtruong@codeaurora.org>
Date:   Sat Feb 9 20:33:23 2013 -0800

    Update copyright to The Linux Foundation

    Change-Id: I145b66896159ff9886ed73507f17b3165ba0266d

commit 7421472e5ceb9d820f3fc17fad9ef4f8250c9ac0
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Sat Feb 9 08:11:36 2013 -0500

    display: Reconcile display HALs

    Make the display HALs compile with/without the Qualcomm BSP
    specific features so they can work with pure AOSP.
    Change-Id: I1ad7282c4fe1fe7e3309afb530a07735f165ffbe

commit 7535aba916bc1f55561e9b07b847d07c7865c53f
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Mon Feb 4 11:03:09 2013 -0800

    libhwcomposer: Don't count video layers marked for SKIP

    When YUV layers are marked for SKIP, it needs to be composed by
    SurfaceFlinger. No need for tracking them in HWC

    Change-Id: I4c8ca9710b709b9df9dcb6867681387b7507e14c

commit 3b6d1115ef81a3fa7deec9e74918459c087f3bfa
Merge: 74c8d7c 8f7a94f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Feb 7 16:36:18 2013 -0800

    Merge "hwc: Pass transform value while cropping dst rect"

commit d81f9e8c065dbc5288d84fd8e23e755961b0bf48
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Thu Feb 7 15:26:04 2013 -0800

    overlay: Remove unnecessary lock.

    Remove the unnecessary lock used in setter and getter of external.

    Change-Id: If752c212e4c28a81db5c6957d0e751444e23ff93

commit 4b9784ea2993348c0cad39cc8f2b53423fa9d58d
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Feb 7 13:55:43 2013 -0500

    gralloc: Do not set ION_SECURE for non-contiguous heaps

    The GRALLOC_USAGE_PROTECTED flag is being used for non TZ DRM
    if non contiguous heaps such as IOMMU are used. Hence do not
    set the ION_SECURE flag for such heaps as they cannot be secured
    through trustzone.

    Change-Id: I48e9460ef66abb827c9df1b3c55037e8e4214f81

commit e1cea3e68ff3c269c68a04e6b3161b6994c64dc1
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Wed Feb 6 16:57:43 2013 -0800

    libexternal: change the order of ioctl call for HDMI

    In driver PUTVSCREEN_INFO ioctl uses the META_DATA to configure, so
    change the order in which the iocts are called during setResolution

    Change-Id: I79e1bcf191756b3567b3e73a8eccd50ecb8857a7
    CRs-fixed: 449567

commit 4333330e1181d35e01bb2b443dcb2e8003c8c073
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Feb 6 13:30:27 2013 -0800

    hwc: Call MSMFB_DISPLAY_COMMIT even if FB handle is null.

    Call MSMFB_DISPLAY_COMMIT for primary FB even if FB handle is null.
    This is already done for external FB.

    Change-Id: I5c405f933ce0fd99df6813acea45169802c54226

commit feb2d8afc9223d28f93c7db4490de209e72f15c2
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Fri Feb 1 02:53:13 2013 -0800

    display: Add support for overscan compensation for ext display

    - Read scan_info sys file node to check if TV underscans
    - Apply action safe parameters to avoid overscan on ext display
    - Store action safe width and height ratio using system  property
    - Use these to calculate the destination position on the ext display
    - Remove unsed ActionSafe Class

    Change-Id: Id27e6fa20966fb13fc16aa7e237cacce8caeb642
    CRs-fixed: 447367

commit 74c8d7c5f93d1bd5fcd277def6b911376c115159
Merge: c94f2f1 dc01a53
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Feb 4 21:36:39 2013 -0800

    Merge "hwc: Do not set Secure flags for UI layers"

commit 8f7a94f8260fd78c51f0acba07ed57dec4a710f9
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Tue Jan 29 18:06:44 2013 -0800

    hwc: Pass transform value while cropping dst rect

    While croping destination rect values for out of bound layers
    consider its transform value.

    Change-Id: I1f6bf25ac8ca8a27a3402c2d946edfaf57ab23d0

commit c94f2f1cb2a8d3f3d57d67687e97aa7fdf896728
Merge: ef72483 cf53700
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 1 19:46:50 2013 -0800

    Merge "libhwcomposer: Allow 2 YUV layer frames to use MDP composition"

commit dc01a53d01339078b3337a40647aa31228692077
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Wed Jan 30 18:34:56 2013 -0800

    hwc: Do not set Secure flags for UI layers

    Change-Id: I5116bcd93ac2a3ab034408e64aa0cd126f734692

commit ef72483668b7092c253e81358e89914b76a3e830
Merge: c8a0fc7 7bf31c3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 29 18:54:15 2013 -0800

    Merge "display: Reset metadata pointer to NULL during unmap."

commit cf53700d9f69e871f81c2263840c8109ebcbf17f
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Mon Jan 21 21:19:15 2013 -0800

    libhwcomposer: Allow 2 YUV layer frames to use MDP composition

    This change introduces the following changes:
    - Frames having 2 yuv layer can be bypassed
    - if not handled by MDP comp, video path will not
      handle any such frames and will be FB rendered

    Change-Id: Id211dbc185608c482badbca00a2708fa6138a8e5

commit 7bf31c32c893f9db1d0c57beb3822192c1bce2dc
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Mon Jan 28 22:51:51 2013 -0800

    display: Reset metadata pointer to NULL during unmap.

    Initialize metadata pointer in the buffer handle to NULL after
    unmapping the buffer pointer

    Change-Id: I930a2d21a6f259426949d7aa58bd07f1f58839c0
    CRs-Fixed: 434388

commit c8a0fc7441fb619c9622ba341544f7103d705f39
Merge: 757b82e 7b03a95
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 28 11:57:11 2013 -0800

    Merge "external: use metadata ioctl to set vic"

commit 757b82e9b0f0551af4945329cb20bb12dedf0cd5
Merge: f472a8c 751afc5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 24 17:32:01 2013 -0800

    Merge "Merge commit 'android-4.2.1_r1' into Upgrade_branch"

commit f472a8cd7777ddab2f6cc2a80febca7daf16e9dd
Merge: 7ac2ba4 bfc79c2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 21 14:35:27 2013 -0800

    Merge "libexternal: set hw.hdmiON system property"

commit 7ac2ba4d1f6dee7ef5632ce1ff66878aa4b3ea69
Merge: 79f6483 288f8c7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 21 12:25:32 2013 -0800

    Merge "liboverlay: Rotator-assisted MDP downscaling of videos."

commit 79f6483252868e3ed453f8875e6f02f60ae468c9
Merge: bdc2fdc 57e3c81
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 21 12:25:28 2013 -0800

    Merge "hwc: Invoke commit ioctl even if there are no app layers"

commit 288f8c7e25b1bda2bc4864ecc8e0fe02107fc4fa
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Tue Jan 15 11:37:54 2013 -0800

    liboverlay: Rotator-assisted MDP downscaling of videos.

    Engage the rotator to assist MDP in performing video downscale for
    primary and external. This saves bandwidth and avoids causing the
    driver to make too many panel mode switches between BLT (writeback)
    and non-BLT (direct) modes.

    Change-Id: Icfabc2c0f978a23cf96c78a9976cf69cea697b5f
    CRs-Fixed: 434852

commit bdc2fdc30a8a45dcdc298e9bd177cd599255d3a1
Merge: 57fbcfe 6f8ca31
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 17 21:36:04 2013 -0800

    Merge "gralloc: Remove update rect"

commit 751afc5239860b165e515df8c2b9aa30d1dcf266
Merge: 57fbcfe f8661e4
Author: Shruthi Krishna <skrish@codeaurora.org>
Date:   Thu Jan 17 11:46:05 2013 -0800

    Merge commit 'android-4.2.1_r1' into Upgrade_branch

    * commit 'android-4.2.1_r1':
      hwc: don't open sysfs on every iteration
      hwc/overlay: Add premultiplied alpha support.
      hwc: external: Cleanup overlay objects on external disconnect.
      display/libhwcomposer: fix potential memory leak
      hwc: Skip secure buffers in non secure mode
      hwc: move enable disable ioctls to vsync thread
      hwc: fix some race conditions
      don't call vsync-ctrl ioctl for same enable value
      hwc: Close unused pipes before PAN
      hwc: Call sync before draw.
      hwc: Fix tearing on HDMI. Call glFinish()
      hwc: Check for the validity of the fb layer
      hwc: Fix dpi values reported
      liboverlay: close all the opened pipes after framework reboot.
      hwc: Add non-zero checks. Move warning log.
      libgralloc: remove pid checks

commit 57fbcfe05a951f3a09b181035d588daa1001e9d4
Merge: f8bba3b 95e4c9f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 16 23:46:56 2013 -0800

    Merge "overlay: mdssRot: Do not reset non-rotation flags."

commit 7b03a95d0af95d27762c0449bc1ab1c4cb1fecf2
Author: Ken Zhang <kenz@codeaurora.org>
Date:   Wed Jan 16 13:23:48 2013 -0500

    external: use metadata ioctl to set vic

    Get rid of reserved field usage

    Change-Id: Icad81d4065f559066a2722fa3227bddab75d665b

commit 57e3c819bb6f700eb3bdc7ef38e2d3691587c1a0
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Fri Jan 11 13:36:33 2013 -0800

    hwc: Invoke commit ioctl even if there are no app layers

      Android has scenarios where it calls HWC::prepare and HWC::set
      without any application layers. In such cases, for power
      optimization, user space avoids  calling PLAY
      (on FB - since there is no new content drawn) and COMMIT ioctls.
      But we might have called UNSET on mdp pipes used for the previous
      frame. As per the current MDP design, these freed pipes will not
      be unstaged unless atleast a COMMIT ioctl is called on that mixer.

    Change-Id: I7f7574b2e589e80c4926533066e35784bb29b4a5
    CRs-Fixed: 437736

commit f8bba3b8abe8b0f2e018f3baa2d12a17298217db
Merge: 029efcb 2515abf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 15 17:51:41 2013 -0800

    Merge "hwcomposer: In Mdss,secure content policy applies to layer buffer"

commit 029efcbeaaacf9d456a110f780aa2494aeabe755
Merge: 8714496 7651a80
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 15 17:51:40 2013 -0800

    Merge "display: Use GRALLOC_USAGE_PROTECTED to indicate secure content"

commit 2515abfe7cd2eded9a39a7472b1e7321cd911119
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Tue Jan 8 16:40:05 2013 -0800

    hwcomposer: In Mdss,secure content policy applies to layer buffer

    In Mdss, mSecureMode is never set, instead the secure content flag
    has been set/unset on each layer buffer.

    Change-Id: I3283533c11206e189ce70dbc84776b2cff3a909d

commit 7651a80dc946dbe651442ce1de8685e3e12e54e8
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Tue Jan 8 16:08:09 2013 -0800

    display: Use GRALLOC_USAGE_PROTECTED to indicate secure content

    For secure content, use GRALLOC_USAGE_PROTECTED flag instead of
    the obsolete flag GRALLOC_USAGE_PRIVATE_CP_BUFFER.

    Change-Id: I69bf8cfd3a978fd472608beb44056e1bf55c1414

commit 6f8ca315d802e448a816808714c214baa435580b
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Tue Jan 15 16:55:06 2013 -0500

    gralloc: Remove update rect

    SurfaceFlinger does not use this feature any more.
    Removing this to avoid usage of reserved flags.
    If this is needed again, it can be added with metadata
    in the display commit ioctl

    Change-Id: Iaf3f14a910ad64c83abb0910fad4a999b663c545

commit bfc79c20580bf145ffc8110a5cf5f8e3083a639e
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Tue Jan 15 13:34:05 2013 -0800

    libexternal: set hw.hdmiON system property

    - hw.hdmiON property is set to 1 when cable is connected
      and 0 otherwise
    - This property can be queried by other modules to know
      if HDMI is connected

    Change-Id: Id513711a676e6cb4eb9a99b3b208b05f6e021047

commit 8714496fd46add9c930486914bfdb6d3d83be80e
Merge: 3ef9e10 4e931c1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 15 04:09:58 2013 -0800

    Merge "libgralloc: force 1M alignment for secure buffers"

commit 95e4c9f9bf5db0d6db87d989143f9e99fe9352f8
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Mon Jan 14 18:44:14 2013 -0800

    overlay: mdssRot: Do not reset non-rotation flags.

    Reset only rotation flags to fix stale orientation flag values.
    Resetting non-rotation flag breaks secure-playback using rotator.

    CRs-Fixed: 440417

    Change-Id: Ia35c6258cfd26358b3dfe5cb006e9245d51e3dfc

commit 3ef9e1031f1f11a25149726b9b8b19c173cbf374
Merge: ad2322a 6b353bd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 14 21:02:11 2013 -0800

    Merge "libcopybit: Merge copybit HAL from jb"

commit ad2322ad9776fefd3ff148aee5dc6cc3a0c4f102
Merge: 92892d5 361da4f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 14 21:02:10 2013 -0800

    Merge "hwc: Add support for copybit(C2D) composition"

commit 92892d53fe03e47e760c0ca82194afdbcb8b6840
Merge: 55f775b eb128aa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 14 21:02:10 2013 -0800

    Merge "libcopybit: Add Async mode support for C2D"

commit 55f775b442c8b8fba0dcb5fecf4cacaa9ceb0670
Merge: 4d0f451 935cb68
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Jan 13 11:34:41 2013 -0800

    Merge "Update buffer dimensions with new dimension"

commit 4d0f451abf98755306a11dca9aa679f8517237c3
Merge: 998bdf7 6e6f9a9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jan 12 01:33:56 2013 -0800

    Merge "display: use metadata ioctl to get panel frame rate"

commit 998bdf712bc2461e3cef0b1c65cea60e5c270896
Merge: d78d153 bbca629
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 11 19:45:51 2013 -0800

    Merge "overlay: mdssRot: Fix the logic for setting Rotator info flags."

commit 6e6f9a907ecc2c8f6e48a41d9b378737475be62b
Author: Ken Zhang <kenz@codeaurora.org>
Date:   Tue Jan 8 15:09:27 2013 -0500

    display: use metadata ioctl to get panel frame rate

    Get rid of using reserved fields

    Change-Id: Ia3ada294427812e8382f744964f475403f6fb73a

commit d78d153d70130054c169e7bd2fecbfafbceeca2f
Merge: 6e04471 12b103b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 11 01:09:29 2013 -0800

    Merge "display: Add NULL check for metadata"

commit 4e931c1d7deafa82957de21d7d929c3cdcc3cf3a
Author: Praveen Chavan <pchava@codeaurora.org>
Date:   Wed Nov 28 19:43:17 2012 -0800

    libgralloc: force 1M alignment for secure buffers

    Align secure buffers to 1M alignment as TZ expects this for
    protecting the buffers, MDP5 onwards.
    Update the buffer-size to the same alignment used.

    Change-Id: I369932a4a72b28c05a3ea216a8bba681de1f9dad

commit 361da4fde0e3eaf8934fbc298438f7fbbb6ced01
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Wed Nov 28 10:42:59 2012 -0800

    hwc: Add support for copybit(C2D) composition

    - Add CopybitEngine to hwc_context
    - draw the layer on the HWC_FRAMEBUFFER_TARGET using
      copybit(c2d) if it qualifies for C2D composition.
    - use fence returned from the copybit during c2d
      composition

    Change-Id: I052da015cd031f7abd6411d83d7944c335caeff7

commit eb128aafbcb98e213ad7c633b8c66689573e4372
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Tue Dec 18 12:38:28 2012 -0800

    libcopybit: Add Async mode support for C2D

    - flush_get_fence API to copybit.h - which is async,
      which returns the fenceFD
    - flush_get_fence calls C2dflush and c2dCreateFenceFD
      signals the c2d_wait_thread which waits for
      transcation to finish and cleanup resources

    Change-Id: I98d5e08ea1cbce9732970c68c1e47b6f396249ce

commit 12b103bdac6709a4ea83bd67ed58a84476e65bb8
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Wed Jan 9 17:47:56 2013 -0800

    display: Add NULL check for metadata

    Add NULL pointer check for metatdata buffer before accessing its
    member variable

    Change-Id: I91de520b76d3c9714f357cff2de696e701811d06
    CRs-Fixed: 434388

commit bbca62988b0acfa361ff0614f9a203e11aba23b3
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Mon Jan 7 18:07:16 2013 -0800

    overlay: mdssRot: Fix the logic for setting Rotator info flags.

    Set the required flags instead of considering SECURE flag only.

    CRs-Fixed: 423045

    Change-Id: I82699d23de97c5276cac8f3b614b5d0463d7b06a

commit 6b353bd3d634042ad3129755c513f47159f8ff4e
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Tue Nov 27 17:18:45 2012 -0800

    libcopybit: Merge copybit HAL from jb

    Single commit having all the following commits

    commit f39e512ad6f51cf35ab00995e52a39f31e76e77f
    Author: Naomi Luis <nluis@codeaurora.org>
    Date:   Fri Oct 19 14:41:32 2012 -0700

        copybit_c2d: Use a single draw call for surfaces with different rotations

        - When opening the copybit module, query the c2d driver capabilities.
        - If supported, use a single draw call for blitting surfaces with different
        orientations using the target target rotate override flag.
        - If not supported, invoke finish_copybit to draw the layers with the
        previous orientation before applying the current orientation.

        Change-Id: I0446f2817786321c9caa2eabf7b6679e5ecbcabe

    commit a4008ff75150c1591c0dca46354e6bb8b30a675b
    Author: Naomi Luis <nluis@codeaurora.org>
    Date:   Thu Oct 18 15:26:15 2012 -0700

        Display: Add copybit_c2d performance optimizations

        Following performance optimizations have been made to copybit_c2d
        - Club all the layers into a single draw call. When finish_copybit
        is invoked, the draw and finish are executed.
        - Send the layer blend mode to copybit.
        - If the blend is set to none, set the pre-multiplied alpha flag.
        SurfaceFlinger assumes all surfaces have pre-multiplied alpha unless
        explicitly specified. Copybit_c2d does the same.

        The following cases are currently exempt from this optimization:
        - Change in C2D target
        - The template surfaces limit has been reached
        - Max. blit object limit has been reached.
        - Change in target transform.
        - Use of any temporary source/destination surfaces.

        Change-Id: I5ad1dc48bbe6d38d319116ccaa800fefb4fbf9f6

    commit b188d739f69272c4820e1a33c5e10aa2f2825a5f
    Author: Naomi Luis <nluis@codeaurora.org>
    Date:   Mon Oct 15 11:17:11 2012 -0700

        copybit: Add finish API

        Add the finish API to copybit. This API is used to indicate the
        end of the drawing required by the copybit client.

        Change-Id: Ica4d13dbe6e7aeb7f88aabb734bf03e86c043acc

    commit ecd56ace395fce78c14e2e753d3221218d062899
    Author: Naomi Luis <nluis@codeaurora.org>
    Date:   Mon Oct 15 11:21:08 2012 -0700

        copybit: Clean up copybit_c2d

        - Remove unused functions
        - Do nothing for the COPYBIT_BLIT_TO_FRAMEBUFFER case when using c2d
        composition.

        Change-Id: Idc416ce3742bb41f060e52ac70add44e584032b9

    commit 35d45d0cff5f6fe866fcb5df71444824a45e046e
    Author: Naomi Luis <nluis@codeaurora.org>
    Date:   Wed Oct 17 10:37:33 2012 -0700

        copybit: Use correct alignment in get_size()

        get_size() is used to get the size required by c2d. It's alignment
        should be 32 and not 16.

        Change-Id: I9fedca0186d0ea19883b967e127417b059621a99

    commit 31311da328cbe2229fcf8d8d8e276ec64005bcb3
    Author: Ramakant Singh <ramaka@codeaurora.org>
    Date:   Thu Sep 20 15:58:29 2012 +0530

        HWC: use uncached buffer for tmp yv12 and tmp stretch buffer.

        Change-Id: Iecc2a9c3c9a365d00d3491ce1007a36484209346
        CRs-fixed: 396574

    commit 5503c90b5001aa4d863139eebcd9c0c43f265702
    Author: Pawan Kumar <pavaku@codeaurora.org>
    Date:   Mon Sep 3 09:14:13 2012 +0530

        copybit: Fix crash when copy_image is called with Tile format

        Add check for copy_image failure case.
        CRs-Fixed: 393122

        Change-Id: I5765120e87a135795d771c5d331275a66ade7e23

    commit 48975bc53702ecba66ecaa5e5769036bb91f5cf2
    Merge: feb1cd6 ab25cb4
    Author: Linux Build Service Account <lnxbuild@localhost>
    Date:   Sat Sep 1 13:36:47 2012 -0700

        Merge "Display ::Use proper ion heap id" into jb

    commit ab25cb4818d9b87886678972f2861bacc93c580a
    Author: Ramakant Singh <ramaka@codeaurora.org>
    Date:   Thu Aug 9 14:23:39 2012 +0530

        Display ::Use proper ion heap id

        Change the MM heap to CAMERA heap for 7627a in use case
        1.Intermediate stretch of low resolution clips
        2.Software conversion of Y12 format

        Change-Id: Ib705d3245f601256179e2dedccbc707df85eb431
        CRs-Fixed: 383115

    commit 90bcaadf41451d89fe80f96961ffc0a07a333145
    Author: Prabhanjan Kandula <pkandula@codeaurora.org>
    Date:   Mon Aug 6 12:50:12 2012 +0530

        libcopybit: fix YUV buffer alignments as per gralloc

        buffer alignment in copybit should be in sync with
        gralloc allignments while allocating buffer.

        CRs-fixed: 377051
        Change-Id: Ib2ae64e368ea3c92d3494c71da605197ccb4a9a5

        Conflicts:

            libcopybit/copybit_c2d.cpp

    commit 95cf0038ea6eb02314024d673418464f0739ddb4
    Author: Sravan Kumar D.V.N <sravank1@codeaurora.org>
    Date:   Thu Aug 2 14:37:37 2012 +0530

        copybit : Add support for NV12_ENCODABLE format

        Change-Id: I7087dcad2238a3c35cc15c28d75b76a9e3ca6718

    Change-Id: I748bffb4215d27f609beec209af0a5047858a314

commit 6e044717788c5e97d43fd3b14d3d274790eebe29
Merge: f51bfae 08c65b3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 8 18:08:16 2013 -0800

    Merge "overlay: mdssRot: Fix stale rotation flag values."

commit f51bfae5eeb631b9f63d4d724d9281a0de61f215
Merge: 018b7d2 3d4c0ac
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 8 18:08:13 2013 -0800

    Merge "libgralloc: Add support for custom buffer size."

commit 018b7d2925bad0b16b8625557755d4a10d16813c
Merge: 8a91d84 ccb4460
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 8 07:20:20 2013 -0800

    Merge "display: Return MDP pipe availability per display type"

commit 8a91d847243bd6d61faf1b062fe822eba9c1f0ee
Merge: 61f5b30 ba9eed5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 7 16:16:57 2013 -0800

    Merge "hwc: commit changes for ext display on blank"

commit ccb4460088a8acae9d3b29f60954922d5c814d7b
Author: Jeykumar Sankaran <jsanka@codeaurora.org>
Date:   Thu Jan 3 12:48:22 2013 -0800

    display: Return MDP pipe availability per display type

    Pipes allocated for one display type cannot be used by other
    display types without calling UNSET on them. So clients should
    check for pipe availablity only for a specific display type.

    Change-Id: Id2244e4976b4cc1f040ada7e56686742d5a65141

    CRs-Fixed: 433870

commit 08c65b3d25c584059b8528bf0d6b0efa66fccead
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Dec 18 14:23:43 2012 -0800

    overlay: mdssRot: Fix stale rotation flag values.

    When moving from a non-zero to 0 orientation rot flags are not cleared.
    This change resets the flag to 0 after every commit.

    Change-Id: I2fb9759921c36620c53bf2ac92d9473a42919d8c

commit ba9eed56530c3a050e5c7c5041baae21bccc05ee
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Fri Jan 4 00:51:29 2013 -0800

    hwc: commit changes for ext display on blank

    - When the device is suspended, the overlay pipes will be unset,
      but they wont be unstaged as there is no DISPLAY_COMMIT ioctl
      called for ext display, as a result the fence wont be signalled
      by the MDP.
    - This is needed as we dont turn off the External display(HDMI)

    Change-Id: I9794ad2ae7c9d7b4ce3f9787f50ea9da87966e41
    CRs-fixed: 425483

commit 61f5b302f2702263d073fa10fc4aaccc5e07c5d5
Merge: a41a79d 37552c5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 4 11:34:24 2013 -0800

    Merge "libexternal: Add support for changing resolution on HDMI"

commit a41a79d598d8effd3188996cf6073ea8ea78489b
Merge: b89712e 75526f5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jan 4 03:16:43 2013 -0800

    Merge "hwc: Delay HDMI/WFD connection request by one frame"

commit b89712e466488e43344870bb4d0ca0eac6d69173
Merge: 4bafd80 cbf7ccc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 3 19:07:51 2013 -0800

    Merge "hwc: mdpcomp: Restructure for 4kx2k displays"

commit 4bafd8010cceebeb39b124d54abcff6542530d25
Merge: 711529a 6e3fab8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 3 12:52:01 2013 -0800

    Merge "liboverlay: Mdss Rotator secure buffer needs to be aligned to 1M."

commit 711529a825329701191cfe3d28288eaf822d1c42
Merge: d772a47 faae042
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 3 12:52:00 2013 -0800

    Merge "liboverlay: Enable secure content flag in Mdss Rotator."

commit d772a4725803227e20ab51033ca700b7c34a77a1
Merge: 3e3a85e 81c4e7d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 3 12:51:56 2013 -0800

    Merge "liboverlay: Check for target specific flag for older platforms."

commit 37552c5ad9a1b47984c8455a527c4a7e704b7a1e
Author: Arun Kumar K.R <akumarkr@codeaurora.org>
Date:   Mon Dec 10 12:47:18 2012 -0800

    libexternal: Add support for changing resolution on HDMI

    - set the property hdmi.resolution with the required mode
      (16,4,3,32,34,1)
    - If that resolution is not supported by the TV, it will fall
      back to the best mode supported by the TV

    Change-Id: I90ceda02319e79e388035ba7b5926bdcf6625595
    CRs-fixed: 430055

commit 75526f59415cbd9564776af324084c31e75fe3d4
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Thu Dec 27 18:27:01 2012 -0800

    hwc: Delay HDMI/WFD connection request by one frame

      This change introduces hdmi pending state, where we allow
      frames to fall back to FB, closing all MDP pipes.

      Pipes could be used by primary (mixer 0) in which case moving
      them to external (mixer 1) involves unsetting them and setting
      them in the same round which is not recommended by the driver.
      It will fall back to GPU till HDMI is configured on a connect
      event.

      CRs-Fixed: 430057

    Change-Id: I4b6677883c499f6d15656c3578190be1115ee6b4

commit 81c4e7d5743e8e53b070bfee01360513359b5115
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Thu Dec 27 22:52:30 2012 -0800

    liboverlay: Check for target specific flag for older platforms.

    Venus color format is not supported on older platforms so add
    check for target specific flag.

    Change-Id: Id215f3a609ed4ebfff7b26bbbd05b727dc374694

commit cbf7ccc4b6f3a2e8fe5d64f51d83757c87737dad
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Dec 19 16:45:51 2012 -0800

    hwc: mdpcomp: Restructure for 4kx2k displays

    Restructure MDPComp class for 4kx2k displays.
    Cleanup MDPComp class to remove unused stuff and formatting.
    Add a MDPCompLowRes class for current functionality.
    Add a hollow MDPCompHighRes class for future.

    Change-Id: I343540e712d31ca907257a73b49567578f49d5f7

commit 3e3a85eff86884c1641d99bde0c3831eae348cd7
Merge: 28b1743 47573e2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 28 12:35:45 2012 -0800

    Merge "display: Add display metadata in buffer handle"

commit 47573e20d5072485e245f3d612d44a9c1e19a5cd
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Wed Nov 7 11:36:41 2012 -0800

    display: Add display metadata in buffer handle

    Allocate extra space for metadata in buffer handles
    Provide api to map this space in client process and set the metadata

    Change-Id: I8bca8448670d4aa88d439320faf402dae30458f8

commit 6e3fab811345e0e93ce4da51855f580f09dedc07
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Mon Nov 19 15:30:33 2012 -0800

    liboverlay: Mdss Rotator secure buffer needs to be aligned to 1M.

    It is TZ requirement, xpu needs the buffer size to be 1MB aligned
    for protection.

    Change-Id: Icd9047a54d5706c321445e7970fb0f455d0c130b

commit faae042b76787a3c956f5757b8b6032322f4536c
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Tue Oct 23 23:48:04 2012 -0700

    liboverlay: Enable secure content flag in Mdss Rotator.

    - Secured contents shared with hardware should be uncached.
    - Secure heap needs to be contiguously allocated & aligned to 1MB,
      which is not supported by IOMMU heap.

    Change-Id: I6c7c00d5363319f9a6db6e52c1e78e1b16ecd9aa

commit 28b1743a9d4b899d27eaf639b8e8ad5cb819de06
Merge: c6be1fe e37e571
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 21:25:59 2012 -0800

    Merge "hwc: Handle ext display device conn/disconn requests"

commit c6be1fe7f2deaf6b63f6bbcf9b878b7e2be57209
Merge: 30362c7 92fc130
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 19:56:10 2012 -0800

    Merge "hwc: Retry vsync on EBUSY"

commit 30362c71a950d84ec50ce21ca187d23726efaa65
Merge: db069ae 94baddc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 18:18:00 2012 -0800

    Merge "hwc: Support swap interval zero"

commit db069aebc1a7a34edf81cf3a9e6e875d5941269c
Merge: 812e368 cf053c6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 18:17:54 2012 -0800

    Merge "hwc: Support 4kx2k FB for Primary and External."

commit 812e368b516783b7f5ce2413ccc5afad447ad1a9
Merge: 6274938 fbffad7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 12:11:47 2012 -0800

    Merge "mdssRotator:For Venus, rotator buffer size depends on rotated w/h"

commit 6274938dd71c9cbcca49a71294bde130a73c1945
Merge: 497f9f3 73dcce4
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 12:11:46 2012 -0800

    Merge "libgralloc: Calculate aligned width & height using common header"

commit 497f9f368b55bbd44560901552cf1233cbb1cdb6
Merge: b10971a e8a0179
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 12:11:46 2012 -0800

    Merge "libgralloc: Import header for Venus buffer size calculation"

commit b10971a6c5c250c824adbb42ace5d77955048e66
Merge: bd6eea2 c5e6148
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Dec 21 12:11:45 2012 -0800

    Merge "display: Add support for Venus color format for newer platforms"

commit cf053c6edab35a580f297e53492bf7340d73fe43
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Thu Dec 13 12:32:55 2012 -0800

    hwc: Support 4kx2k FB for Primary and External.

    Add support for 4kx2k FB for primary and external panels.
    Change class design to create appropriate version of FBUpdate on boot up based
    on the panel resolution.

    Change-Id: I216d815d9b81c610aa39e351f7b55736dfa48b43

commit fbffad72c8e5132145aedb9b66d3375409329efe
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Tue Nov 6 13:05:42 2012 -0800

    mdssRotator:For Venus, rotator buffer size depends on rotated w/h

    Due to alignment requirements on venus format, rotator buffer size
    calculation needs to be performed according to destination buffer
    dimensions. Due to these alignments, the buffer can be different
    when width and height are swapped due to 90 degree rotation.

    Change-Id: I8eb0f1ece22946e6c3b2106623c3457e6871fd9c

commit 73dcce48d6f44baafc199f4f93e4172477bab38e
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Thu Nov 15 14:25:19 2012 -0800

    libgralloc: Calculate aligned width & height using common header

    For Venus, calculate aligned width & height using common header.

    Change-Id: I622fee19693cfc550796d5949185c146c6a7f173

commit e8a01791fe268b13238da7ebcc71d214ef12bf58
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Thu Nov 1 16:25:45 2012 -0700

    libgralloc: Import header for Venus buffer size calculation

    Import the common header file with Venus alignment requirements
    to calculate venus buffer size.

    Change-Id: I86cba91de8f7a3845a4592243b4f21e7cda03315

commit c5e61488bfaa459baad3c9100fff2ab4f1bb73d4
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Wed Aug 22 17:13:32 2012 -0700

    display: Add support for Venus color format for newer platforms

    Change-Id: I4c9a327bd30d1321e1f8383ffc1ca978efc8e9b9

    Conflicts:

    	liboverlay/overlayUtils.h
    	libqdutils/gpuformats.h
    	libqdutils/qcom_ui.cpp

commit 3d4c0ac4f2600ca28eb3229ed0c7b0e4c0408c3c
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Mon Dec 10 15:42:54 2012 -0800

    libgralloc: Add support for custom buffer size.

    Init allocSize hook function with alloc_size function

    Change-Id: I514d47928f10b6c41404aa19d8b704f64327211b

commit 92fc1309f0f1d81abe72520733f8e9899cb16a00
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Dec 19 15:58:10 2012 -0500

    hwc: Retry vsync on EBUSY

    The driver returns EBUSY if it is unable to complete the frame
    within a timeout - this is a recoverable error

    Change-Id: Ifde01c1d7515598a82d032c0ba869fa658b050a9

commit e37e5711cfbc23433c35b2e39524dcd734480d2b
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Mon Dec 17 17:36:02 2012 -0800

    hwc: Handle ext display device conn/disconn requests

      On HDMI connection, two uevents are generated
        1."change@/devices/virtual/switch/hdmi"
        2."change@/devices/virtual/switch/hdmi_audio"
      Since we look for "change@/devices/virtual/switch/hdmi",
      Display HAL will process the hotplug request twice.
      This causes regression on HDCP enabled devices.

      Change involves to check for uevent str with
      "change@/devices/virtual/switch/hdmi" to ensures
      that we process connection request only once.

    Change-Id: Ica97fd4ef3c8e1064e7d757ab754bb1ee4a3fcaa
    CRs-Fixed: 429803

commit 94baddc4d7e25742c4492aeed9114a251b68f1ed
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Mon Dec 17 18:51:01 2012 -0500

    hwc: Support swap interval zero

    Set debug.egl.swapinterval to zero to disable
    fences with MDP composition enabling swap interval zero.
    This is to measure performance only and will cause tearing.
    CRs-fixed: 429343
    Change-Id: I1460a02d568e69826800486a9a695d7a8953d4f8

commit bd6eea2dc44b3903636c833b0af1f090ba186aae
Merge: 62f0399 8fb0d32
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 18 12:16:06 2012 -0800

    Merge "libcopybit: Correct AOSP license marking."

commit 8fb0d32b7efcba4a934d37b1a716baf309853641
Author: Mathew Karimpanal <kjmathew@codeaurora.org>
Date:   Tue Dec 18 10:44:53 2012 -0800

    libcopybit: Correct AOSP license marking.

    Change-Id: I6beffe8a33605132468a76f4ef4221266b954ea5

commit 62f0399f532918dc6669c5215f561555f8f8d49f
Merge: d74f5f3 c180c4e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 17 17:35:36 2012 -0800

    Merge "gralloc: set ION_SECURE to flags instead of heap_mask during ion alloc."

commit d74f5f3e4c4132f71326cec704352da92211cc7c
Merge: 9f4b113 d7f8427
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 15 21:35:59 2012 -0800

    Merge "gralloc: Mark framebuffer as ION memory"

commit 9f4b113d8b342e751173eb19359c01bed038274b
Merge: 62e3474 dec98cc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 15 21:35:56 2012 -0800

    Merge "display: Standardize log-tags for qcom display logs."

commit 62e3474ce3143a4bc6c08de964e38f35a00c8350
Merge: 109ab1e 8df2ebf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 15 21:35:52 2012 -0800

    Merge "hwc: Fix issue with Layercache"

commit 109ab1ee8511c8c38452a99f702b6d52bf49eb19
Merge: 9b91262 c6bd6d9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 15 15:54:08 2012 -0800

    Merge "display: Add target specific flag to support Venus color format"

commit 9b9126225aea8ab49f15eb819498a6b5aca2c970
Merge: 3b7e997 d95c408
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 13 18:56:09 2012 -0800

    Merge "libgralloc: Change ion_allocation_data fields." into jb_2.5

commit 3b7e99747e90138cfdb18876855f52a5ba51a843
Merge: 449cd8d ece296e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 13 18:56:07 2012 -0800

    Merge "libgralloc: Use ION_IOC_CUSTOM instead of MSM-specific ioctls" into jb_2.5

commit 8df2ebf6e91cff9b33ffdeea7b6388b3dcbe9668
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Dec 12 11:26:18 2012 -0500

    hwc: Fix issue with Layercache

    When MDP comp is done the layer cache
    is not reset. Calling the layer cache updated
    after MDP comp is configured ensures that the
    cache is reset correctly.

    Change-Id: I9fc3ddd713ceac4be708e33782c3661e758dfcb9

commit 449cd8de2364a2d497ee3e8be8381e8c23bb622d
Merge: 1e461a1 ba48b01
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 13 10:35:55 2012 -0800

    Merge "overlay: Do not unset overlay for MSMFB_NEW_REQUEST"

commit 1e461a1f2d6b1991f2fbd15bf50cdf24ac5a8890
Merge: 18aafb7 e78f052
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 13 10:35:50 2012 -0800

    Merge "hwc: User Layercache for external display"

commit 18aafb751fc6400359c82b8a315d33b2594d7deb
Merge: 9e44256 3f2323f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 13 10:35:44 2012 -0800

    Merge "hwc: Remove buffer_fence definition as it is not used"

commit 9e44256c0b22fd41009769046642f13b14e3813a
Merge: e97c35f 9da8466
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Dec 13 10:35:43 2012 -0800

    Merge "external: memset commit struct"

commit d7f842768a38d3a43713018065320b2175166446
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Dec 13 13:09:53 2012 -0500

    gralloc: Mark framebuffer as ION memory

    Change-Id: I859d4d03b62279b7e66ba52e3215fe7394a63434

commit e78f052ce5506af02e1604b4470c18c1a3843c2b
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Fri Dec 7 18:24:28 2012 -0500

    hwc: User Layercache for external display

    Change-Id: Ibca92e1470ef72dc02d16d4ef8c05f1a1d2d485c

commit dec98cc96e47c12e819717a1e6a7fbeeb6f4537a
Author: Mathew Karimpanal <kjmathew@codeaurora.org>
Date:   Mon Nov 12 22:27:02 2012 -0800

    display: Standardize log-tags for qcom display logs.

    Change-Id: I75bc2d8db8d64994097d6b744f357c29c9a5717a

commit c6bd6d92c282c123915c2eb79163a58ad4a05bbb
Author: Sushil Chauhan <sushilchauhan@codeaurora.org>
Date:   Wed Dec 12 12:33:01 2012 -0800

    display: Add target specific flag to support Venus color format

    Venus color format is not supported on older platforms. Add target
    specific flag in display hal and define Venus macros to zero for
    older platforms.

    Change-Id: I38141ae870e255a0e54ce9fde46fe6cc3415f179

commit ba48b01c18450a50f9c09e9217f9c83dcb5da3b5
Author: Ken Zhang <kenz@codeaurora.org>
Date:   Tue Dec 11 20:33:59 2012 -0500

    overlay: Do not unset overlay for MSMFB_NEW_REQUEST

    Change-Id: I40c21964db91e098f6f445e7860fefd09dcad768

commit c180c4eba4650561a54b038a80e6f8030f481cd5
Author: Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org>
Date:   Tue Oct 9 10:13:55 2012 -0700

    gralloc: set ION_SECURE to flags instead of heap_mask during
    ion alloc.

      This is required for Secure Playback usecase.

    Change-Id: I590bf126a35465286a9487490a114af82732e262

commit 3f2323fbbe2ae5200964a801efff82f1accbac79
Author: Ken Zhang <kenz@codeaurora.org>
Date:   Sun Dec 2 18:55:11 2012 -0800

    hwc: Remove buffer_fence definition as it is not used

    Change-Id: If5f4beceda0229c9f48b6b1ee74e23a95f14863a

commit 9da8466f295a6fed0dd71eb3910db14a2dcdd9d6
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Dec 6 19:29:29 2012 -0500

    external: memset commit struct

    Change-Id: I5e6d046f2fdff54fdd58aaca583c0ae8038a9a63

commit d95c4083ccc98f795847c34c6574e8a219e4cf7c
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Fri Sep 14 14:18:21 2012 -0700

    libgralloc: Change ion_allocation_data fields.

    Change ioc_allocation_data structure fields as per changes in kernel.
    The 'heap_mask' feild will hold what the older flags field held.
    The 'flags' field will hold the caching information.

    Change-Id: Id3b2e8a4d1ba370e0f982860fdb32b56227e2e43

commit ece296ec988e7d58a93961776c6a539f67bcd6f2
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Tue Sep 11 13:33:44 2012 -0700

    libgralloc: Use ION_IOC_CUSTOM instead of MSM-specific ioctls

    Use ION_IOC_CUSTOM instead of ION_IOC_CLEAN_INV_CACHES.
    ION_IOC_CLEAN_INV_CACHES is now specified as a command argument of the
    ION_IOC_CUSTOM ioctl.

    Change-Id: I5b59ba1032364dfb884a90abf2ee2b35f3c09dd6

commit 935cb684ca3ce35dc112475c6ae6dc94185d5ab9
Author: Ramkumar Radhakrishnan <ramkumar@codeaurora.org>
Date:   Wed Nov 7 16:43:38 2012 -0800

    Update buffer dimensions with new dimension

    Add case GRALLOC_MODULE_PERFORM_UPDATE_BUFFER_GEOMETRY in
    gralloc_perform function to update the new buffer dimensions.

    Change-Id: I7a855dc017dd042dda2abdc28c51ce5ec919fceb

commit f8661e4aea657e6b7b0c42f0d88a9e6d9ec724be
Merge: 2edd033 d6cc450
Author: The Android Automerger <android-build@android.com>
Date:   Mon Oct 29 11:20:05 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit d6cc4509f48b95ccbe406a1043321d8c762ae404
Merge: 08212c0 2a018d1
Author: The Android Automerger <android-build@android.com>
Date:   Thu Oct 18 06:59:46 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 2a018d1e1adf910bb46521f292870f80f1fd871a
Merge: eaf6791 94fccaf
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 16 06:59:35 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 94fccaf0761ad02295a5e74dc3b441ec42753ee0
Merge: 541b59d b6aa2f1
Author: The Android Automerger <android-build@android.com>
Date:   Fri Oct 12 16:32:51 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit b6aa2f10672cbb9c0078d7832b520b760ad7f694
Merge: 27c1d65 c5d4822
Author: The Android Automerger <android-build@android.com>
Date:   Thu Oct 11 07:03:56 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit c5d4822328cea0aa731de9bb12b4b3e165403290
Merge: c23b380 dbcb4f3
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 10 14:06:43 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit dbcb4f3990249b4be080cd128ffac984913165b7
Merge: 150806a 7980f10
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 10 06:59:34 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 7980f10db732ad33a40088504d77ce6adc1cc8c4
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Oct 4 19:19:55 2012 -0400

    hwc: don't open sysfs on every iteration

    Also, read again if vsync read is interrupted

    Bug: 7305728
    Bug: 7274951
    Change-Id: I563a4c4cacab8f124ac988ad98640b57a3d09813
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 725dd86d38631047d361aa46417517f3ac88b398
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Mon Aug 20 15:25:28 2012 -0700

    hwc/overlay: Add premultiplied alpha support.

    Add premultiplied alpha belnding support while using MDP for composition.
    Layers could have PMA blending which was missing from hwc1.1
    This change just handles the PMA case.

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

commit f9a7ef2e5faae1cf004ab9779deb3e016c12b994
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Fri Oct 5 17:48:58 2012 -0700

    hwc: external: Cleanup overlay objects on external disconnect.

    Cleanup overlay objects and close fds when external is disconnected.  Without
    this, the external does not come on when cable connected-disconnected multiple
    times when device is in suspended state.

    Bug: 7150885 (part of the fix)
    Bug: 7295979
    Bug: 7150885 (partial)
    Change-Id: I1ae2ce7220b9928dde332ce3644dbe671d25c7e6
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 18bcd14ae2336b948b3029095ced880a6043af7f
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Mon Oct 8 14:03:01 2012 -0400

    display/libhwcomposer: fix potential memory leak

    This changes fixes a memory leak, by freeing up the pipe alloc structure
    everytime before parsing the current frame.

    related-to-bug: 7301196
    Change-Id: I23edefca71ec0209291be24ee9d629b4a80f0a25
    Acked-by: Jeykumar Sankaran<jsanka@codeaurora.org>
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 8ae9c5923209c302d42fcb9abc4e0773fb9b8e75
Merge: ae823e7 cd89f8c
Author: The Android Automerger <android-build@android.com>
Date:   Sun Oct 7 18:58:09 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit cd89f8c4efc53f6cabf1f72f4d6b401d900a5f88
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Oct 4 15:56:00 2012 -0400

    hwc: Skip secure buffers in non secure mode

    Bug: 7283255
    Change-Id: Ia4ca0ef4ad4c57deea25c82dfdef009a2c1f82d6
    Acked-by: Amara Venkata Mastan Manoj Kumar<manojavm@codeaurora.org>
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit d8e715f8da7b20b251d8d46ed722cc37a287d4a5
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Oct 4 15:10:30 2012 -0400

    hwc: move enable disable ioctls to vsync thread

    This patch stabilized the vsync signal.

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

commit c52b3308e3ec00d6109bd7090da2d8c5571d1c2a
Author: Iliyan Malchev <malchev@google.com>
Date:   Thu Oct 4 10:38:28 2012 -0700

    hwc: fix some race conditions

    Fix some race conditions between hwc_eventControl and the hwcVsyncThread.

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

commit 36345b947479f532c1a1fdcd329f1671ee029b88
Author: Omprakash Dhyade <odhyade@codeaurora.org>
Date:   Wed Oct 3 02:26:55 2012 -0700

    don't call vsync-ctrl ioctl for same enable value

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

commit 84693f0e80c63a0325805c4da4bc4e8b5ac4b79c
Merge: c4d034f d6fd637
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 3 06:59:51 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit d6fd637405783dfae9023b311afe394cf830f898
Merge: 32ff225 848de19
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 2 06:59:47 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 848de198603324f83551724cd54bd3cdb728e0fd
Merge: 3825f25 9dbd53a
Author: The Android Automerger <android-build@android.com>
Date:   Sun Sep 30 06:59:45 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 9dbd53a3b8662d404d550bbeb05f53344f254816
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Thu Sep 27 13:17:59 2012 -0400

    hwc: Close unused pipes before PAN

    If the pipes are closed after PAN a blank screen is
    seen when when we transition from MDP composition
    to GLES composition.
    We close the unused pipes at the beginning of the set
    since the decision has already been made in prepare.

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

commit 23f8309b083563ed1058d763b673c445640f1f9a
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Sep 26 21:09:40 2012 -0700

    hwc: Call sync before draw.

    Call sync before draw since draw could use rotator which reads out of the
    buffer.  For that to happen cleanly, the buffer should not be in use.  Calling
    sync before draw makes sure, the buffer is free to be used.

    [TEMP]
    Enable rotator for external video, since sync-pt is not used for external yet.

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

commit 3b95b4cbf23bc0c8cae4c7a5233511812e3fa0a0
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Wed Sep 26 17:16:51 2012 -0700

    hwc: Fix tearing on HDMI. Call glFinish()

    When rotator is rotating GPU writes into it causing tearing.  With hwc1.1,
    framework doesnt use fbDev, which had a call to glFinish().  Consequently, this
    was missed out. Adding this missing code to hwc1.1

    Related-to-Bug: 7227220
    Change-Id: I7287d3d73b839fef818e31c1c8a783f1fb96d9f1
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit f8f79fb10e33be3f08736164743706e5857fa293
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Sep 26 18:33:58 2012 -0400

    hwc: Check for the validity of the fb layer

    Need to check if this is valid before doing anything
    Extra NULL checks all around to prevent any invalid
    lists from SurfaceFlinger

    Change-Id: I57ca97167e469910bcaaa68672ae70b41a061ded

commit 65eedd519c2516360017b9782f8aec383975e11d
Author: Naseer Ahmed <naseer@codeaurora.org>
Date:   Wed Sep 26 20:14:38 2012 -0400

    hwc: Fix dpi values reported

    HWC 1.1 expects DPI multiplied by 1000

    Bug 7241591

    Change-Id: I680da8769f53f8a18d942a3b292d96a16885ebfa

commit daaaebc4fad20a896502a6f5613ceecbcaeb8baf
Merge: 86623d7 d6fdfbf
Author: The Android Automerger <android-build@android.com>
Date:   Wed Sep 26 06:59:45 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit d6fdfbf41ca1bf209ad90fa54bec9d048e721784
Merge: 2dd04a8 d1bd318
Author: The Android Automerger <android-build@android.com>
Date:   Sat Sep 22 09:42:04 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit d1bd318f2db77daf9625d173b575e88aedeff44c
Merge: 0a03dd8 bfe0f3a
Author: The Android Automerger <android-build@android.com>
Date:   Wed Sep 19 07:01:40 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit bfe0f3a197edbd0fc8e75a1d8a793a21a48cc391
Author: Ajay Dudani <adudani@codeaurora.org>
Date:   Fri Sep 7 13:37:49 2012 -0700

    liboverlay: close all the opened pipes after framework reboot.

    b/7147557

    Add initOverlay() function to close all the opened pipes when
    Surfaceflinger process gets killed.

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

commit c9829cd9259d17126c7a100f864ee686a7051745
Author: Saurabh Shah <saurshah@codeaurora.org>
Date:   Thu Sep 13 09:33:51 2012 -0700

    hwc: Add non-zero checks. Move warning log.

    Add check for presence of non-zero number of layers.
    Move the "composition after powerdown" log under that check.
    Move the caching of dpy under list non-null check.

    Change-Id: I99b9293e671a15ba1fb31692e30413d2bbd97867

commit e8952576dd4e3b205d66d60acd504370308989ef
Merge: e557e6e 127177c
Author: The Android Automerger <android-build@android.com>
Date:   Thu Sep 13 06:59:57 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 127177cdde97f983cdaa8149f9395754315eee37
Author: Kinjal Bhavsar <kbhavsar@codeaurora.org>
Date:   Mon Sep 10 12:35:11 2012 -0700

    libgralloc: remove pid checks

    These pid checks seem to have been left over from PMEM days.

    Change-Id: I1e504bc889b90d8fed6e0be47fd21d1e3f42c50b

Change-Id: I628bf9fcfeca43b8e4940bc77ccdffd4068f6cbd
qcom_display-caf: fixed derp in previous merge

Change-Id: I85d3b502f767e7a71b25ee9241f54118a96b2738