Revert "Make kernel compatible with gcc <=4.8"

This reverts commit 5109a041fcd29c08974668e8579c4e55f33c5f5a.
Revert "net:bluetooth:l2 cap core GCC 4.8 patch"

This reverts commit 94a892933edcf35272a77bb11c2a9536c65270a0.
vidc: updated headers

Change-Id: I853f9dc3c5e2c28a441367ec0f044dc317ba9930
Update to qdsp6 version 3

Change-Id: I589c8ebb854a2f883b7996be7795f4069b8f3760

Conflicts:

	include/linux/msm_audio_mvs.h
msm: rotator: Partial update to jb_chocolate

Change-Id: I8bf66ce48190490b6cae15ca8a3f021e6ac0d02e
Update iommu to jb_chocolate

Change-Id: I74f5239677eee4c15b389279190488fb206de6df
msm-fb: display: ion framework support

Add support for the ION memory manager
to the framebuffer driver

Adapted to HTC Evo 3D by Johnnyslt

Change-Id: If012dcdbbc71eb0f7d4d429ad4789b3276d34a58
Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Signed-off-by: Darescu Ionut <johnny@esi.ro>
v4l: add control definitions for codec devices

Add control definitions and documentation for controls
specific to codec devices.

Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Change-Id: I94e1be196120988cfee2420ba6bd342eece1f481
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
v4l: Add frameskip parameter

v4l2_qcom_frameskip is a QCOM specific parameter to be used with
VIDIO_S_PARM to indicate that the driver might take up to
maxframeinterval nanoseconds in providing the next buffer.

Driver supports this parameter if the V4L2_CAP_QCOM_FRAMESKIP capability
is set in VIDIO_G_PARM.

Change-Id: Iebbd012b9cc75395b1e165349e7e2d9d7a77160a
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
(cherry picked from commit 51cbd0accc560b8941ab7c25f4a838f233bf301a)
v4l: add fourcc definitions for compressed formats

Add fourcc definitions and documentation for the following
compressed formats: H264, H264 without start codes,
MPEG1/2/4 ES, XVID, VC1 Annex G and Annex L compliant.

Change-Id: Ibd87db4f72793310871ebd7a178e9593c4b54d33
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
(cherry picked from commit 8b02007a6b8887182b3b783518e0620922070e94)
vidc: Enable error concealment in video core

Without error concealment, there is a bug in video core due to which it
goes in to bad state for certain clips and times out. This change fixes
the issue.

CRs-fixed: 336167
Signed-off-by: Arun Menon <menon@codeaurora.org>
(cherry picked from commit 0a1dfa3ebb6056c8969fd594be998b7e666a74cd)

Change-Id: Ib3f8de2ff96bfe4d0db35197950fe758f9186b03
Signed-off-by: Yen-Pin Hsiao <yphsiao@codeaurora.org>
Signed-off-by: Darescu Ionut <johnny@esi.ro>
msm_fb: display: Update video format on fps change

Added check for frame rate change. Corner case if there is no
change in xres,yres and pixclock.

CRs-Fixed: 356328
Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
(cherry picked from commit 1b92af6e05320b6f5858a0e4b5c9aa40e54a9b54)

Change-Id: I43cb099068ef4c69a364b142eb3c34a3fc426db6
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>
Signed-off-by: Darescu Ionut <johnny@esi.ro>
msm: clock-8x60: Add IOMMU clock aliases for the video driver

The video driver needs control of some IOMMU clocks for secure video
playback. Add the necessary aliases to the clk_lookup table.

(cherry picked from commit 966922b3dc1649163c699e9b10da236341420aaf)

Change-Id: Ibdaf3d1f05aa0dd3e1feb0a5f2a07892b0eba586
Signed-off-by: Riaz Ur Rahaman <riazr@codeaurora.org>
sync: Add synchronization framework

Change-Id: I209f9db2824e0313f467f11ab09e5f54f0a4a6b5
Signed-off-by: Erik Gilling <konkers@android.com>
sw_sync: add cpu based sync driver

Change-Id: I1042851f5e30f9fdc2f35bdad84123bcf108560f
Signed-off-by: Erik Gilling <konkers@android.com>

Conflicts:
	drivers/base/Kconfig
sw_sync: add fill_driver_data support

Change-Id: Ib3812d282db56362d82f5ccc9a12b7d2100ab93a
Signed-off-by: Erik Gilling <konkers@android.com>
sync: add poll support

Change-Id: I294e481bba92658e6dd26f157ddbf0e9ff4ce8a5
Signed-off-by: Erik Gilling <konkers@android.com>
vigor: defconfig: enable sync
Revert "vidc: Enable error concealment in video core"

This reverts commit 8cc6dac978286ca76611d3c987b7b88f6efeda23.
Adding support for trace events for sync point driver