msm: vidc: merge cyanogenmod/android_kernel_samsung_msm8660-common
msm: kgsl: Add new sysfs node to list GPU clock frequencies

Add a new sysfs node to communicate available GPU clock frequencies
to userspace for the power daemons.

CRs-Fixed: 391579
Signed-off-by: Anshuman Dani <adani@codeaurora.org>
(cherry picked from commit 0e80b365d2b6e15344a774667a1e273edb2d64ff)

Conflicts:

	drivers/gpu/msm/kgsl_pwrctrl.c

Change-Id: I21fd05aec3a633f82d3dc396240f6e91bcdb8425
Signed-off-by: Ram Kumar Chakravarthy Chebathini <rcheba@codeaurora.org>
vidc: 1080p: Copy input frame tag to the output frame tag

In slice delivery mode, sometimes video hardware is giving
zero frame tag on output slices instead of input frame tag
value. This commit will fix the issue by copying the input
frame tag value to the output slice frame tag when video
hardware gives zero frame tag values.

Change-Id: Id766a4801422d0d1f769f15a35dfd948d5c51535
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>
(cherry picked from commit 7baf72acea6d6409eac18713ab9c66f418ce5aa4)

Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>

Conflicts:

	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
vidc: fix wrong number of slices in slice delivery mode

The slices completed is not matching with the expected number
of slices in frame done. The fix is available in July firmware
release and this commit will have the corresponding video driver
changes.

CRs-fixed: 380629
Change-Id: Ia5c2cce2e95e31deac023a6c855fd385494ee56b
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
(cherry picked from commit 909aebf7bd4d89fb5acccd64b27349cf93a736e0)

Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
vidc: Error handling for memory heap mapping.

Memory heap should be unsecured if secure call is successful.
This change will make sure that an unsecure will be called
only if securing of the memory heap went through fine.

CRs-Fixed: 393041
Change-Id: I49dd81d1846fc6936518c750a32921c8498ddb95
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
Signed-off-by: Riaz Ur Rahaman <riazr@codeaurora.org>
(cherry picked from commit 4dd8c627764b9bd362f78085ed469969c2ddbe7f)

Conflicts:

	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
msm_fb: display: add blt condition check at video/lcdc off

Blt mode may be enabled during system suspend. Need to make
sure blt overlay done  before turn off video/lcdc timig generator.

Change-Id: Iad54ee544499213bb7c9cfe60d00919f819aacb1
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
(cherry picked from commit 4b251d6f0067af78a0a424af5054747cc38a0904)
msm_fb : Add option to enable/disable  mixer commit

Adds support to enable or disable mixer commit during pipe
staging operations. Depending on the current activity, this
selection can be made.

Change-Id: Ia2f5dbab58f73ef4de90abf7f278332d8d73df46
Signed-off-by: Pradeep Jilagam <pjilagam@codeaurora.org>
(cherry picked from commit f9bc16bf6dcb8beb7d5d6405ee5dc767e6decdff)
msm_fb: display: add mdp clk rate calculation for low vbp

For the panels that have low v_back_porch, if h/w FIR scaling is used,
during vbp time, mdp clk should be fast enough to output a line from 4
input lines. MDP rate equation for very small scaling, e.g. 1 or 2
pixels' upscaling or downscaling cannot cover this case, where
underruns are seen on those panels.

Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
(cherry picked from commit e9d4bc826ca849b873f9e91bda68004aa7d78b25)

Conflicts:

	drivers/video/msm/mdp4_overlay.c

Change-Id: I63aadf8e322c17fad2019b2c4081b0d13209f504
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>

Conflicts:

	drivers/video/msm/mdp4_overlay.c
msm:vdec: Correct filled length of the output buffer

Filled length of the output buffer at FBD for videos
with frame height less than 96 was incorrect. With
this change, we get the proper filled length.

CRs-fixed: 395179
Change-Id: I12d60ef653225b0bf2f0088e515cac19a19ed80a
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
(cherry picked from commit f01274b904a4899b13c64f35f2479a1080bfb2c4)

Conflicts:

	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
Revert "vidc: Error handling for memory heap mapping."

This reverts commit 7adf4e60fdd03c408d6fd7c4c7f6b78b6eab77d8.
Fix building
msm: clock-8x60: Fix clock mapping for mmfpb_a_clk

Clock names changes to the tables removed any clock with
connection name mmfpb_a_clk. Add an entry so that we can use
clk_get_sys() to get the clock in the clock driver.

Change-Id: Ie6cdaee9e68833eaf8db86785143ed856f179d27
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
(cherry picked from commit 279196ec356e382e6e8a00160457847bdb482a87)

Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>