ion: restore ics ion_allocation_data structure

Change-Id: I3f5b105dc0cbb0cb5c77bf6d917b474804fcfde3
Revert "msm_fb: display: add support for HTC display_on function"

This reverts commit 22b25b79782a16fb4c49dc865fcb9c023058598a.
Revert "msm_fb: display: power display on when powering panel on"

This reverts commit 67a8c44361a999ef0b670b3fe2089e08d0571609.
msm: Kconfig: make HTC boards select FB_MSM_MIPI_DSI

Change-Id: I3c2b4d733d310589339f37afa1b7581c779241d8
msm: HTC 8960: disable building unneeded panel drivers

Change-Id: I922810ba7e63d6f5a6283267aa2d96e4a1376361

Conflicts:
	arch/arm/configs/elite_defconfig
	arch/arm/configs/jet_defconfig
	arch/arm/configs/ville_defconfig
kgsl: disable kmemleak_not_leak reporting

This spams the kernel log. It is likely this has other repercussions
that are unknown at this time.

Change-Id: I06882d83971fe4665e9add2435f3e368a65c568d
msm_fb: display: fix dsi_busy_wait race condition

After pipe_commit() released mutex and before kickoff happens,
There has possibility that dcs command may start transmitted.
This patch add dsi_mdp_busy flag to fix this race condition.

Change-Id: I0d9a81cd0719085c91c03386117261ad3bb6b182
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
jewel: fix HTC panel driver for HW vsync

Change-Id: I2a74580919b19cd3333d70c231ba92a104f65c36
ASoC: msm: reduce period_bytes_min for voice call

- Allow smaller buffer size for voice call to
  comply with MR1 audio HAL

Change-Id: Iaffca753ad07889b08ae4b6154e8d596950a979e
Signed-off-by: Mingming Yin <mingming@codeaurora.org>
Linux 3.0.54

Change-Id: Ib37dcf153240195099214a543303e5ac4247ca7e
Linux 3.0.55

Change-Id: I6abd6b227d4ff0bff2f4feeaa11202f026c2c097
Linux 3.0.56

Change-Id: I15e06de26153204eeb2b81e8c6c641e14c328cd4
msm: HTC 8960: remove manufacture ID command

This command does nothing and is a potential race condition.

Change-Id: Ie4da0173628161cd25e0448bdf65199ff7789a8f

Conflicts:
	arch/arm/mach-msm/display/board-elite-panel.c
	arch/arm/mach-msm/display/board-ville-panel.c
Linux 3.0.57

Change-Id: Ie7bc7b59807f70760c58976354072c264fe15f99
Revert "ion: restore ics ion_allocation_data structure"

This reverts commit b6fe09157d23c97b8fbb0f1e5cc7be3ca28b0922.
gpu: ion: repurpose flags field for heap_mask and caching

In the latest Ion API, userspace clients specify the heap_mask for an
allocation in the `heap_mask' field of the ion_allocation_data
structure, and they specify caching in the `flags' field. Before, the
heap_mask was in the `flags' field and caching was specified with the
O_DSYNC file open flag.

We would like to support the new API without actually updating Ion. To
do this, | the heap_mask back into the flags field on an allocation
ioctl (since the internal kernel APIs still expect to see it
there). Also make sure that caching is taken from the buffer flags
field rather than the O_DSYNC file flag.

Change-Id: I872afb40d9bf7c49bb31f19c5e9726ac714ef850
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>

Conflicts:
	drivers/gpu/ion/ion.c
	include/linux/ion.h
gpu: ion: move msm-specific ioctls to custom_ioctl

To avoid collisions with future ioctls that may be added to ion,
msm-specific ioctls should use the `custom_ioctl' interface provided
by struct ion_device, as originally intended.

Change-Id: Ic36f1ff37ce79926482942f70d466acf95c9c170
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>

Conflicts:
	drivers/gpu/ion/ion.c
gpu: ion: fix some missing defines for ion mini upgrade

Change-Id: Iaa23687f1014c03b9064239b291a6b4200de26d4
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
msm: ion: Only return Ion flags in ion_handle_get_flags

Since the ion_buffer.flags field is shared between the actual Ion
flags as well as the Ion heap mask, make sure that we're only
returning flags. The heap_mask bits should be masked off.

Change-Id: Ibdaf0ea374b7b80a036bddd11d19c4bafa173ef6
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
ASoC: msm: qdsp6: Fixed the issue unmap command is sent incorrectly

When session CLOSE command is sent right before session RUN command
is acknowledged, callback function can mistakenly think that
the next received acknowledgement is for CLOSE command instead of
RUN command. This triggers driver to send memory unmap command to
the Q6 while it is still processing the CLOSE command. Eventually,
this leads to an invalid memory access and causes Q6 crash.

Change-Id: Ib5d560fbcb7e8ced79cc1075a9f6bea3b55a86b6
CRs-Fixed: 377281
Signed-off-by: Jay Wang <jaywang@codeaurora.org>