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

Conflicts:
	arch/arm/mach-msm/board-elite.c
	arch/arm/mach-msm/board-jet.c
	arch/arm/mach-msm/board-ville.c
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

Conflicts:
	drivers/video/msm/external_common.c
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/mdp4_util.c
	drivers/video/msm/mdp_dma.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.h
	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker_api.h
	drivers/video/msm/vidc/common/dec/vdec.c
	drivers/video/msm/vidc/common/enc/venc.c
	drivers/video/msm/vidc/common/enc/venc_internal.c
	drivers/video/msm/vidc/common/init/vidc_init.c
	drivers/video/msm/vidc/common/vcd/vcd.h
	drivers/video/msm/vidc/common/vcd/vcd_api.c
	drivers/video/msm/vidc/common/vcd/vcd_client_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_core.h
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
	drivers/video/msm/vidc/common/vcd/vcd_util.h
	include/linux/msm_mdp.h
	include/linux/msm_vidc_enc.h
	include/media/msm/vcd_property.h