Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""
 (CR) msm_fb: display: reduce turn-on display time.

    When turning on panel, increase its priority and restore it
    after panel has been turned on to reduce Turn-on display
    time when press power key.

    cherry pick commit:c43ca6a4 from main-jb-qc branch.

Change-Id: Ie0e8e55fc7498a6b2d43ad9e1995fa96c609c81e
Reviewed-on: http://gerrit.pcs.mot.com/500101
Tested-by: Jira Key <JIRAKEY@motorola.com>
Reviewed-by: Bang Nguyen <BNGUYEN1@motorola.com>
Reviewed-by: Jason Hrycay <jason.hrycay@motorola.com>

Conflicts:

	drivers/video/msm/mipi_dsi.c

Signed-off-by: Luis Cruz <ljc2491@gmail.com>
input: mms_ts: Increase touchscreen sensitivity

With the updated d2 firmware, the previous sensitivity was
just too much. Since 0xlab used the value of 0xFFFF on their
development board, let's keep the pattern and use the value
of 0x0FFF [0xFFF]

Signed-off-by: Luis Cruz <ljc2491@gmail.com>

Conflicts:
	drivers/input/touchscreen/mms_ts_144.c

Conflicts:
	drivers/input/touchscreen/mms_ts_144.c
Merge "Merge "Merge "msm: kgsl: fix a race condition when calling kref_put"""
Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""
Merge "Merge "Merge "msm: kgsl: fix a race condition when calling kref_put"""
ARM: mm: remove IPI broadcasting on ASID rollover

ASIDs are allocated to MMU contexts based on a rolling counter. This
means that after 255 allocations we must invalidate all existing ASIDs
via an expensive IPI mechanism to synchronise all of the online CPUs and
ensure that all tasks execute with an ASID from the new generation.

This patch changes the rollover behaviour so that we rely instead on the
hardware broadcasting of the TLB invalidation to avoid the IPI calls.
This works by keeping track of the active ASID on each core, which is
then reserved in the case of a rollover so that currently scheduled
tasks can continue to run. For cores without hardware TLB broadcasting,
we keep track of pending flushes in a cpumask, so cores can flush their
local TLB before scheduling a new mm.

CRs-Fixed: 623919

Change-Id: I2ed0f2ab6635bf900bcb81e29efbd01991da8e86
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Git-commit: b5466f8728527a05a493cc4abe9e6f034a1bbaab
Git-repo: https://android.googlesource.com/kernel/common/
[spathi@codeaurora.org: removed unused function set_asid().
The function cpu_set_reserved_ttbr0() is not available since patch
"ARM: Use TTBR1 instead of reserved context ID" is not merged
so used old functionlity by calling cpu_set_asid(0)]
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""
Allow d2dcm access to charging data table

Change-Id: I67d599724868d9eeb710dc5d8750ecc5f1fbda49
Merge "Merge "Merge "msm: kgsl: fix a race condition when calling kref_put"""
Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""
Merge "Merge "Merge "msm: kgsl: fix a race condition when calling kref_put"""
Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""
Merge "Merge "Merge "msm: kgsl: fix a race condition when calling kref_put"""
Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""
Revert "input: touchscreen: d2_fw: Update firmware"

Change-Id: Ic1c336a1044adc0cc155b37e0c7397c1c4f0d1c7

This reverts commit c2e189edf64901d15359c281889e0500448514d1.

For some reason this causes either:
-No boot past splash screen
-Boot to lockscreen but unresponsive to touch

This is only the case for some users, most users have no issue using this updated firmware. Revert until we figure out what the issue is.

Change-Id: I65c8acacbfc847b71730bf18bea8eecc8f57c44c
Merge "Merge "Merge "msm: kgsl: fix a race condition when calling kref_put"""
Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""
Merge "Merge "Merge "msm: kgsl: fix a race condition when calling kref_put"""
Merge "Merge "msm: kgsl: fix a race condition when calling kref_put""