GitLab

this is needed for linux upstream merge

Don't try to free the link structure before it is allocated.
Return the error directly if it happens before the kzalloc()

Change-Id: I6e5bfe47a43c458f20d5799aee32c55a286ee8e3

Let's try this again, with a larger audience and without breaking
the flo. The previous results were inconclusive and we rushed putting
the dispatcher back in, we need a larger audience to test it.

This reverts commit 2ca12ad5.

Fence sync seems to react badly when it gets a unexpected timestamp
on a timeline.  When a event expires always send the expected timestamp
even if the event expired because the context was destroyed.

Change-Id: Id1bc18220223c665012df1db21eea78af78d9288
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>

Add support for MDP_YCBYCR_H2V1 interleaved YUV format in rotator
block.

Change-Id: I4bb192aaab1e72f6e5687ae222a5f9ea2c254bd4
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>

Add support of MDP_YCBYCR_H2V1 interleaved YUV format to MDP
for a-family targets.

Change-Id: I5afb84a95693d1ced114152364782a10c4d56bc2
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>

This is a follow up change on gerrit 442946. Wait for DMA_P has to be
replaced with VSYNC even in Pan Display Path.

Change-Id: I8d600022cfa63f54d5b72ea5f64fc55315079b3a
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>

In the current implementation, we are waiting for DMA_P interrupt
in commit call to signal completion. This can cause 2 commits happening
in the same vsync period due to which IOMMU page faults can happen when
vsync comes while second commit is programming resgisters. To avoid this,
wait for DMA_P is replaced by wait for VSYNC.

Change-Id: I68d4d4b4e7a574f86faecd5b4812e1f5852f4209
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>

Change-Id: Iee8a99e9df20805904f950968b01ae70cf0d4322
Signed-off-by: Evan Anderson <evan1124@gmail.com>

Change-Id: I51807e458f9db94c3ac05f8f8b108494a7fdd720

This reverts commit d9517109.

Revert "Revert "msm: kgsl: Add a new command submission API""

This reverts commit 684335cb.

Revert "Revert "msm: kgsl: Don't process events if the timestamp hasn't changed""

This reverts commit f8ff679d.

Revert "Revert "msm: kgsl: add kgsl_sync_fence_waiter for server side sync""

This reverts commit b2f6dbe0.

Revert "Revert "msm: kgsl: Add support for KGSL_CMD_SYNCPOINT_TYPE_FENCE""

This reverts commit 6c370a51.

Change-Id: I24d74e97f982121ca02e47c3fc96143d4e7365e6

This reverts commit a2e8ddc223934857a56bbe9bafc62f872567c787.

Change-Id: I28f4be2d28528efa9d007abc5a36be1e92e2bad4
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

Conflicts:
	drivers/gpu/msm/Makefile
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a2xx.c
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/adreno_dispatch.c
	drivers/gpu/msm/adreno_drawctxt.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/adreno_trace.h
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_mmu.h
	drivers/gpu/msm/kgsl_pwrctrl.c

This reverts commit c177eb9e5d25e0b7cf5b5cba434b052fb36a33cd.

Change-Id: If33bd6c52ebf16d0402886f0a41c2a015ef69f8a
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

This reverts commit 3366075c1daab3a762a6bff510d6ebd62f3ff2a9.

Change-Id: I77c3d7a7be0c952b6a81efb385f15208b278087a
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

This reverts commit 878a3c0d92c0126782e7f6d77d3a52a62b28dcf8.

Change-Id: Ib2271b8402336a7d6050649f5bfe9cb47008be5f
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

This reverts commit e4a13f8ecc300aeb12be524525a29597e63812cb.

Change-Id: I1202782313439afac9ee625f695d2b7ba957d8d7
Signed-off-by: Tarun Karra <tkarra@codeaurora.org>

Merge branch 'android-msm-flo-3.4-jb-mr2' of https://android.googlesource.com/kernel/msm into cm-10.2

 * Firmware doesn't support secure metadata, and this is breaking DRM.
 * Disabling secure metadata allows userspace to work again.

Change-Id: Iaa510626f03da952239c709742cab75348bf62c6

WQ_HIGHPRI was implemented by queueing highpri work items at the head
of the global worklist.  Other than queueing at the head, they weren't
handled differently; unfortunately, this could lead to execution
latency of a few seconds on heavily loaded systems.

Now that workqueue code has been updated to deal with multiple
worker_pools per global_cwq, this patch reimplements WQ_HIGHPRI using
a separate worker_pool.  NR_WORKER_POOLS is bumped to two and
gcwq->pools[0] is used for normal pri work items and ->pools[1] for
highpri.  Highpri workers get -20 nice level and has 'H' suffix in
their names.  Note that this change increases the number of kworkers
per cpu.

POOL_HIGHPRI_PENDING, pool_determine_ins_pos() and highpri chain
wakeup code in process_one_work() are no longer used and removed.

This allows proper prioritization of highpri work items and removes
high execution latency of highpri work items.

v2: nr_running indexing bug in get_pool_nr_running() fixed.

v3: Refreshed for the get_pool_nr_running() update in the previous
    patch.

Change-Id: Id843c0a425f51f84083786fbf413d999d35771b7
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Josh Hunt <joshhunt00@gmail.com>
LKML-Reference: <CAKA=qzaHqwZ8eqpLNFjxnO2fX-tgAOjmpvxgBFjv6dJeQaOW1w@mail.gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Git-commit: 3270476a6c0ce322354df8679652f060d66526dc
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

Introduce NR_WORKER_POOLS and for_each_worker_pool() and convert code
paths which need to manipulate all pools in a gcwq to use them.
NR_WORKER_POOLS is currently one and for_each_worker_pool() iterates
over only @gcwq->pool.

Note that nr_running is per-pool property and converted to an array
with NR_WORKER_POOLS elements and renamed to pool_nr_running.  Note
that get_pool_nr_running() currently assumes 0 index.  The next patch
will make use of non-zero index.

The changes in this patch are mechanical and don't caues any
functional difference.  This is to prepare for multiple pools per
gcwq.

v2: nr_running indexing bug in get_pool_nr_running() fixed.

v3: Pointer to array is stupid.  Don't use it in get_pool_nr_running()
    as suggested by Linus.

Change-Id: I46e9488601d764d25e4a6c707de129ab68f7064c
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: 4ce62e9e30cacc26885cab133ad1de358dd79f21
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

GCWQ_MANAGE_WORKERS, GCWQ_MANAGING_WORKERS and GCWQ_HIGHPRI_PENDING
are per-pool properties.  Add worker_pool->flags and make the above
three flags per-pool flags.

The changes in this patch are mechanical and don't caues any
functional difference.  This is to prepare for multiple pools per
gcwq.

Change-Id: I1824fd1c509d8ac6b0619536621a22b15b316256
Signed-off-by: Tejun Heo <tj@kernel.org>
Git-commit: 11ebea50dbc1ade5994b2c838a096078d4c02399
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

Modify all functions which deal with per-pool properties to pass
around @pool instead of @gcwq or @cpu.

The changes in this patch are mechanical and don't caues any
functional difference.  This is to prepare for multiple pools per
gcwq.

Change-Id: I4be6727e1cce6f9aa2a0057b96bdc725c84f1ea8
Signed-off-by: Tejun Heo <tj@kernel.org>
Git-commit: 63d95a9150ee3bbd4117fcd609dee40313b454d9
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

Move worklist and all worker management fields from global_cwq into
the new struct worker_pool.  worker_pool points back to the containing
gcwq.  worker and cpu_workqueue_struct are updated to point to
worker_pool instead of gcwq too.

This change is mechanical and doesn't introduce any functional
difference other than rearranging of fields and an added level of
indirection in some places.  This is to prepare for multiple pools per
gcwq.

v2: Comment typo fixes as suggested by Namhyung.

Change-Id: Iefae84798c2af580f425b92ed79117935d99f21f
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Git-commit: bd7bdd43dcb81bb08240b9401b36a104f77dc135
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

Unbound wqs aren't concurrency-managed and try to execute work items
as soon as possible.  This is currently achieved by implicitly setting
%WQ_HIGHPRI on all unbound workqueues; however, WQ_HIGHPRI
implementation is about to be restructured and this usage won't be
valid anymore.

Add an explicit chain-wakeup path for unbound workqueues in
process_one_work() instead of piggy backing on %WQ_HIGHPRI.

Change-Id: Iecd17a9935ee28f856d8b726bb4c296762922bed
Signed-off-by: Tejun Heo <tj@kernel.org>
Git-commit: 974271c485a4d8bb801decc616748f90aafb07ec
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

arch/arm/mm/init.c: In function 'arm_memblock_init':
arch/arm/mm/init.c:380: warning: comparison of distinct pointer types lacks a cast

by fixing the typecast in its definition when DMA_ZONE is disabled.
This was missed in 4986e5c7c (ARM: mm: fix type of the arm_dma_limit
global variable).

Change-Id: Id076f2bebe307609265afdd4229181d2004c5f9c
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>

 * Upgrade the ION setup code to properly configure the devices.

Change-Id: Ia20beeb72de253c76b746e2d56251d2e5abbaefa

Change-Id: Ib5da0ec76b773a746a9ebfb39eadbd63caeb9462

 * Update board file to match clocks and driver.

Change-Id: I9f8efeffd26ef22c32a16bea81ea02d2f1cb88b8

This reverts commit 605f3146.

Change-Id: I31ae9444e6d5b13a447cd2356c8fa3db717c228c

The chip variant present on those devices doesn't need(/use?) this

Change-Id: Ibace93bd6f12c8ebe35be245021d1fd888765db6

This reverts commit 98abd581, since
we also want to support the BCM20792...

This reverts commit f45fe43b.

This reverts commit b597a8e4.

Change-Id: I71fa3901188706dd609f6bb5630976292a05c996

Change-Id: Ib18136772a5cc9603d5f690c64297d5755c3cdd6

Change-Id: I89981a439c3b30ad1a79c7debf6947648ae50719

Currently, scm_call internally calls kmalloc() to allocate a command
buffer structure. This prevents scm_call from working before kmalloc
structures are initialized or during atomic contexts. Allow clients
to pass in a pre-allocated buffer for scm_call to be used for internal
structures.

Change-Id: Id09500c8c696298228aefdcc2a61953e654677c9
CRs-Fixed: 498392
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

This patch adds initial support for the PMU featured in the L2x0
series of Level 2 Cache Controllers, supporting L220 & PL310.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Change-Id: I04d54f5b2586264ac3325a0ed19c452d25f8fd4c
[ashwinc@codeaurora.org: Remove unused functions for passing compilation.]
Signed-off-by: Ashwin Chaugule <ashwinc@codeaurora.org>