power: fbearlysuspend: add sleep hack for CRT-off animation

HTC panels don't seem to work correctly with the Android
CRT-off animation. Add a short sleep period to let userspace
finish drawing the animation.

Change-Id: If9526a911ef585375a441a7f13d1674537eec3ec
Linux: 3.0.52

Change-Id: Ie0cb065fe8f36a433478db183cc3b4053cd221a4
msm: HTC8960: reset board ION memory reservation to CAF style

Change-Id: I3190c7bf29ea90c7af16f3d14c5ea05d92a74280
gpu: ion: remove HTC added rotator heap

Removing HTC rotator heap means the total heap count must be reduced as
well. Since we cannot use the audio heap this leaves 6 ION heaps when
IOMMU is enabled, and 7 without.
ASoC: msm: Remove hardcoded frame size dependency on sample rate.

The driver has hardcoded dependency for period size on sample rate.
This restricts driver from being used for all sample rate and period
size combinations.

The driver also introduces an unnecessary delay in giving the first
buffer to dsp both for playback and record case. resulting in delay
in start of session.

Change-Id: I9e0eb9b426e4f77c161dc7ef72b152d081979013
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
ASoc: msm: Avoid memory allocation failure in proxy driver.

- Allocating memory using dma_alloc_coherent is resulting
failures due to fragmentation
- Fix the issue by replacing the API with
allocate_contiguous_ebi_nomap.

CRs-fixed: 358301
Change-Id: I726623d23c0080b7207911181590fa417c3e9886
Signed-off-by: Jayasena Sangaraboina <jsanga@codeaurora.org>
msm: audio: qdsp6v2: Update ACDB driver to use ION

Update the ACDB driver to use ION instead of PMEM
driver to allocate memory.

Change-Id: I8934ccf9c75db5921f51aac2f518c342948678cc
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/qdsp6v2/audio_acdb.c
msm: audio: qdsp6v2: Replace PMEM with ION in Audio Decoder drivers

ION is replacement for PMEM which is less complex with better
reference counting. Hence ION which is a superset of PMEM is
used to allocate memory in the audio decoder drivers.

Change-Id: I088e532a34e266bbfc3ac0a01e12acc3418c7ca6
Signed-off-by: Chaithanya Krishna Bacharaju <chaithan@codeaurora.org>
msm: audio: qdsp6v2 Fix error handling in memory registration

Three instances of incorrect error path handling.  The first two
didn't initialize the 'result' variable before return (reported by Rob
Clark <rob.clark@linaro.org>).  The third was comparing the address of
a local variable against NULL, which will never be true.

Change-Id: Ia318c9331cc0ff896c4073389f3e666fa19eb4af
Signed-off-by: David Brown <davidb@codeaurora.org>
msm: Asoc: audio: Migrate to ION from DMA alloc

-RT proxy driver is using DMA alloc. Migrate them to
use ION memory to save memory and avoid stability
issues.

Change-Id: Idc2296bc5ecf76d6b846f204478c33f58423bb72
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
ASoc-msm: Modify ASM drivers to invoke ION APIs

Create ION client and allocate buffers based on
the client handle and free the buffers when no
more needed

Change-Id: I00be9dbd3e8f5eff286d8f1bc0d61656866bf360
Signed-off-by: Swaminathan Sathappan <Swami@codeaurora.org>
msm: HTC 8960: reserve memory for ION audio

Change-Id: I4033608394c7267d7a55c9cd8f625946b1b5588b
Linux: 3.0.53

Change-Id: I1b1fae9b1fc7db15073143bc4017187af4d6c66e
msm_fb: display: update to jb_mr1_chocolate

Sync display code to 'Adding support for trace events for sync point
driver'.
Commit: d25bb742c0f72d451303e10195761bcde459f97d

Change-Id: I57891b3a138e00c146de41d01d838133c4395d25
msm_fb: display: power display on when powering panel on

Change-Id: I90655b6baa0cb1ebbf9f0ef58932fd94ec0cf54d
msm: rotator: update to jb_mr1_chocolate

Sync rotator code to 'Adding support for trace events for sync point
driver'
Commit: d25bb742c0f72d451303e10195761bcde459f97d

Change-Id: Ib94bbf70aca030c44f2629de22763241a458f347
drivers: gpu: Backport Adreno driver

Sync to drivers/gpu/msm to d2 kernel at 'Backport Adreno driver'

Change-Id: I13034fef2afafddfefac0763fc801afbd9e5bddb
gpu: ion: update to jb_mr1_chocolate

Sync ion code to 'Adding support for trace events for sync point driver'
Commit: d25bb742c0f72d451303e10195761bcde459f97d

Change-Id: I16ac69a43cb35f267436f7b117d9db1333ea3f70
ion: Fix build with qcache disabled

 * Qcache is still unstable and buggy, but currently crashes if fully
   disabled on 8960.
 * Allow disabling of Qcache for 8960 and fix the dependency in msm_ion.

Change-Id: I3b2fc40ecce757530b64ddabb03081aaa425b603
base: genlock: update to jb_mr1_chocolate

Sync genlock code to 'Adding support for trace events for sync point
driver'.
Commit: d25bb742c0f72d451303e10195761bcde459f97d

Change-Id: Ib7a0944915daa92ca2a4b2c6f84b4d67764b6a2e