updates from armv6

Change-Id: Ibcf4d2770870abe8c7fc253f1272bd16573413be
[P350] port some code from vee3

Change-Id: I9a50bf143e4f26314f4dfd722c2496cd99cce0c5
Revert "msm: kgsl: Hold the pm_qos vote at all times when ACTIVE"

This reverts commit bd5c9acef81caad5fa5dae7e62ccd2cb5866e161.
Revert "msm: kgsl: Check the current interrupt status before power operations"

This reverts commit 4cea347d50cc35700cd6d5c38a793458eac411f3.
stop giving me error

Change-Id: Ibde39369da0e22e8e2db0db6e74130f7dd519941
msm: display: sync point clean up

Remove unused fence input in mdp_display_commit
structure
Use different timeline name for different fb

Change-Id: I4edd335b36dce057ff3e54302af6088a9cc470ec
Signed-off-by: Ken Zhang <kenz@codeaurora.org>

Conflicts:

	drivers/video/msm/msm_fb.c

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

Conflicts:

	drivers/video/msm/msm_fb.c
msm: display: increase fence timeout

Increase timeout value to 900ms to allow
gfx engine to render longer.
When sync_fence_wait fails, need not put fence as
it will be handled outside the loop.

Change-Id: Id4caff55c9f99c48e5f87a85d30fe4c8c0cd65e7
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
Signed-off-by: Shruthi Krishna <skrish@codeaurora.org>
msm_fb: display: Send current timestamp in case of timeout

On timeout while waiting for the vsync, send the current
timestamp to the userspace. This resolves the infinite
wait seen during the bootup.

Signed-off-by: Siddhartha Agrawal <agrawals@codeaurora.org>
Change-Id: I0d7b8750becfbb4e5c5e47b29ded6395627e8862
msm: mdp: Fix reserved field usage

An earlier commit(ec5b2f)increased the number of reserved fields
in the kernel standard fb.h header changing the struct size.
This caused issues with userland applications using the corresponding
bionic header. This patch revert the earlier increas in size
and makes corresponding adjustments to the reserved field usage.
A follow up patch will remove usage of reserved fields entirely.

Change-Id: Ibc2c00de71e5a6d2563a8a8a3e0916d15faef32b
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
Signed-off-by: Arun Kumar K.R <akumarkr@codeaurora.org>
[P350] Enable TUN driver

Change-Id: I32ac1f5c97ecc0df9438ab86b4503df4bc3ea10d
video: msm: PCC/GC config register protection

PCC/GC configuration registers are shared with other features. This patch
makes sure that the other features implementations don't overwrite the
existing settings for PCC/GC.

CRs-Fixed: 345395
Change-Id: I5467a4c50eae214181d67a7976eee92c0ae26fe5
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
fix merge

Change-Id: I2263e0843ef7c45cce047e969c37ee4cbb0def6f