Merge "msm: kgsl: fix race condition setting the event->handle"
Merge "msm: mdss: call suspend and resume panel events during runtime triggers"
Merge "Revert "ASoC: msm: qdsp6v2: disable OCMEM by default""
Merge "msm: mdss:Add splash logo configuration entry in fb"
Merge "Revert "msm: camera2: add api for set actuator for manual af"."
Merge "Revert "mmc: sdhci: retune on cmd or data CRC error""
Merge "Merge "Revert "msm: camera2: add api for set actuator for manual af".""
msm: mdss: Move bus scale table implementation to device-tree

Bus scale table is chip-set dependent where number of paths per
bandwidth use-case can differ chip-set to chip-set. Current
implementation has a static table where it supports only one path per
use-case. Expand MDSS bus scaling implementation to accommodate
chip-sets where more than one path per use-case, i.e. apq8084, is
possible and move table initialization to device-tree so that every
chip-set configures its own table.

Conflicts:

	Documentation/devicetree/bindings/fb/mdss-mdp.txt
	arch/arm/boot/dts/apq8084-mdss.dtsi
	arch/arm/boot/dts/msm8226-mdss.dtsi
	arch/arm/boot/dts/msm8974-mdss.dtsi
	drivers/video/msm/mdss/mdss.h
	drivers/video/msm/mdss/mdss_mdp.c

Change-Id: Ia6f76654d129fe0ec1a7124aa87b16f96167fe84
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
msm: mdss: move mdss fudge factors to device-tree

MDSS has a common driver for multiple chip-sets. Each of these chip-sets
can have their own fudge factors for calculations of resource demand.
Move these pre-defined fudge factors to device-tree since they are
platform dependent.

Conflicts:

	Documentation/devicetree/bindings/fb/mdss-mdp.txt
	arch/arm/boot/dts/msmsamarium-mdss.dtsi
	drivers/video/msm/mdss/mdss.h

Change-Id: Ia558a2ad0a096b49cdabf41dd25cf30c843149c4
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
mdp: mdss: Tune bandwidth and clock based on ROI

Calculate bandwidth and MDP clock requirement considering
the ROI submitted for a frame. When doing partial frame update
for smart panels, the data actually fetched for a pipe is not
always the full resolution of the buffer programmed. Use the
ROI passed to find out the region of fetching and calculate the
bandwidth and clock values accordingly.

Change-Id: I01f24f8fd9a42a2c4d705b8eb0a7658e79884175
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
msm: mdss: Add support for macro tile formats

MDP now supports tile formats on APQ8084. Macro tile formats
are aligned with number of memory banks and access channels to
improve performance.

Conflicts:

	Documentation/devicetree/bindings/fb/mdss-mdp.txt
	drivers/video/msm/mdss/mdss_mdp_pipe.c
	include/uapi/linux/msm_mdp.h

Change-Id: Ie566cc12b38f81d111f378f19883433bcc71fa48
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
msm: mdss: calculate mdp clk requirement of each pipe with the fudge factor

Currently the mdp clk margin is added for the final calculated max of
all individual pipe clk requirements to avoid underruns. When this
final rate is greater than the max rate that h/w can support, pipe
decimation mode may not be enabled to avoid underruns. So, move this
margin calculation into each pipe clk so that when any individual pipe
has higher clk rate than the max, pipe decimation can be enabled.

CRs-fixed: 538803
Change-Id: Ia4dc500cfc27e7e4d08f03066b511ed3e4ae4664
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
media: msm: Freeze H camera code

 * Freeze camera code to avoid userspace breakage.

Change-Id: Id5137389249019e42087f0e2e1a959ac18e36cc8
Merge branch 'kk_3.5_rb1.19' of git://codeaurora.org/kernel/msm into cm-11.0

Change-Id: I8cc519ed1b6b72af82923db1968f7a85695ece77
media: msm: Additional changes for H camera freeze

Change-Id: I8adb8b6672b855061585e9175d8d04776fb9f6a6
msm8974: Merge DT changes to Samsung version

Change-Id: I885479e4f26f406887003ca0bf84810fd13976d7
Merge "Merge "Merge "Revert "msm: camera2: add api for set actuator for manual af"."""
msm: wfd: Add timeouts to completions

In the case of Venus going into a bad state and not returning buffers,
timeout of the completion so that the driver isn't stuck perpetually
waiting for a buffer.  This at least gives the driver a chance to clean
up and exit gracefully.

Change-Id: I05dd1e2977999bd17bd79e78eb8882fddf6a4aa4
CRs-Fixed: 589645
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
Revert "msm: mdss: Display splash screen during boot up"

This reverts commit 2f5b7a1d1a0f48dfd4c8dd4f4dcdd1fa3cc60d30.
Revert "msm: mdss: Distinguish BL_DCS_CMD from DCS_CMD on 8x10"

This reverts commit 2b0875ff78d3e4656a8a5155d3de0d7504bdd56b.