Commit Graph

50493 Commits

Author SHA1 Message Date
Ram Mohan Korukonda
07e1499c08 Bluetooth: Support for Remote name request cancel command
Add support for remote name request cancel command in mgmtops
plugin.

Change-Id: If8bec8b457461f7bca90af940d2473b810677322
CRs-fixed: 414884
Signed-off-by: Ram Mohan Korukonda <rkorukon@codeaurora.org>
Signed-off-by: Mallikarjuna GB <gbmalli@codeaurora.org>
2013-03-15 17:05:31 -07:00
Deepak Verma
f84beb65e4 msm: vidc: Separate meta buffers support in secure mode
Extradata is appended at the end of each output buffer
in non secure video use case but in secure video playback,
the client/CPU don't have access to the output buffer
to parse the extradata. This change allows the client/CPU
to parse the extradata by allocating separate buffers for
video hardware to store extradata.

Change-Id: I12927ea3d142b9cecd6fb1ae1086c5624d0e08d6
Signed-off-by: Deepak Verma <dverma@codeaurora.org>
2013-03-15 17:05:26 -07:00
Hamad Kadmany
147589256c media: dvb: mpq: Secure demux support
This change adds support for demuxing of encrypted streams which current
software demux implementation does not support.
User-space API is extended to allow setting of key ladder information
needed in order to perform decryption.
If secure demux application is available, demuxing does not take place in
the dvb demux sw filter anymore but instead is performed in the new secure
demux, regardless of whether the stream is encrypted or not.
Otherwise, the dvb demux sw filter will be used as before and demuxing of
encrypted streams will not be available.

Change-Id: If75a7b03d1f13d3b012250b87c25eaf6d6cbc399
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2013-03-15 17:05:25 -07:00
Hamad Kadmany
936e0d378e media: dvb: Report error statistics in new PES events
Report counters for transport error indicator, continuity-counter
errors and total number of TS packet constructing a PES in the
PES events so that applications can decide whether to decode
or drop the packet based on the errors information.

Change-Id: I8680163783a12c4f2518cd83fa0b3c7dfa882c34
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2013-03-15 17:05:24 -07:00
Jouni Malinen
7f62074388 cfg80211: Add TDLS event to allow drivers to request operations
The NL80211_CMD_TDLS_OPER command was previously used only for userspace
request for the kernel code to perform TDLS operations. However, there
are also cases where the driver may need to request operations from
userspace, e.g., when using security on the AP path. Add a new cfg80211
function for generating a TDLS operation event for drivers to request a
new link to be set up (NL80211_TDLS_SETUP) or an existing link to be
torn down (NL80211_TDLS_TEARDOWN). Drivers can optionally use these
events, e.g., based on noticing data traffic being sent to a peer
station that is seen with good signal strength.

Change-Id: I778f5136fc4518bedcaed14a5412de4be6c85cf3
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Ng Chilam <chilamng@qca.qualcomm.com>
[Madan Mohan Koyyalamudi <mkoyya@codeaurora.org>: move changes from
include/uapi/linux/nl80211.h to include/linux/nl80211.h, remove trace.h,
remove trace_cfg80211_tdls_oper_request() in nl80211.c ]
Signed-off-by: Madan Mohan Koyyalamudi <mkoyya@codeaurora.org>
2013-03-15 17:05:22 -07:00
Jordan Crouse
4947b43388 msm: kgsl: Remove support for IOCTL_KGSL_SHAREDMEM_FROM_VMALLOC
All userspace consumers should now be using IOCTL_KGSL_GPUMEM_ALLOC,
so we can safely remove this kludgy and deprecated code.  The structs
and #defines are left in the header to avoid breaking userspace and
to serve as a reminder of the way we were, but any use of
IOCTL_KGSL_SHAREMEM_FROM_VMALLOC will return -ENOTTY.

Change-Id: Ic0dedbad1460acfe28116ee2dbd75faa52b76857
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
2013-03-15 17:05:21 -07:00
Kuirong Wang
54898d0cd6 ASoC: wcd9310: Update wcd9310 compander configuration
Update the Compander register settings to remain the default
settings after the system bootup and optimize compander
configuration sequence.

Change-Id: Ib475f3bb84414546b4ead1d3f013dc173317e1b3
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
2013-03-15 17:05:16 -07:00
Mansoor Aftab
3a8193dd58 Camera: Rollback to stock camera driver & ION/IOMMU port
-Move to stock camera driver without dual camera, PIP
 changes.
-Changes to make this older stock camera driver compatible
 with newer ION interface & IOMMU.

This partial revert brings us back to the following commit:

commit 954b92b26c
Author: insup.choi <insup.choi@lge.com>
Date:   Mon Jul 2 15:24:23 2012 -0700

    camera: add mako camera driver imx111, imx119

    Change-Id: I5451ba05023fe7cbe3442512924062e7dc63f3f4

Signed-off-by: Iliyan Malchev <malchev@google.com>
Signed-off-by: Mansoor Aftab <maftab@codeaurora.org>
Change-Id: Ic8aac872572989c7747b4a2b36190ac2da6617ee
2013-03-15 17:04:30 -07:00
Punit Soni
7e229153d6 msm: camera: vision mode sensor driver
Required to activate the vision mode in s5k6b2yx sensor.

Change-Id: I56e7c56fed414d030e6e57ff7e15c20a071c5dc6
Signed-off-by: Punit Soni <punits@codeaurora.org>
Signed-off-by: Ninad Patgaonkar <ninadp@codeaurora.org>
2013-03-07 15:25:40 -08:00
Abhijeet Dharmapurikar
fae0afd7be msm: power: update power drivers to msm-3.4 tip
This branch is currently very outdated. Cherry pick the following
changes in order to bring recent fixes to this branch.

Change-Ids
Ib99cd49623698d0295bc3c3cf880225495d530cb
Ifba2bd1248e8bb47a0700dec4d321d32db4f2066
I0fc1e116c0f5a5648f99df967bdbb41fe5a07cbc
I8e3e9068e7b9a3bfd24c07a00bb3953180ce0741
I2bf31a23199f942a9ac843b9940a0f7377256238
I96b47c8603a291c41c5769fab9483d83fefb6084
If3c5f00f4b75d03838ee556235697369fd2e47dd
I32d50caf7b7a84db2654b69baafb40a441f46bf0
Ibd1020113de05e8214d41ffb975d4c95d3bb1ccf
I67c2ac422b0ba1e5eca11ffccfe7e112c2e65a3d
I2c149e6edd7c194e7f31ece95e2003ffde935806
I1f4b65cba149480fb4a8f91667ce45a876dff2f0
I2605afc2d6f9f3569ec783b2d23881f31cc9038a
I77b40f9cb8295cff1d4a24dfc7d85b0e57262f6e
I8ec5a68cad573218a0b0bd0073277b76978417ff
I9eaf7f21c73dd1ceaf97589cbf82b722706c48c2
I089725e20ae20956530e570d918a87b72e59626e
Ifa70a4daf01414dfafed7830e3a6a682c42e9364
Iaace5bc1d0611619f11b760ea6986eadb7346da1
I415d7831f15c0d690fd118ff190cd710a31368c6
I1e55bbfe37c7cc6f62581af11280a565ed648c06
I11938c569a25b026ee6b7b5125cec930676ec01d
I07577d1aa57bfa4bee40b52c18b5bfcb1cdb7070
Icdb0a28b5f9456135c60badf726c367b02f6d762
I4f14b7419f7a90813650601638f6563422c13ae4
I016a33c358be2e7a2d26202f2e9b168dd54b6d34
I43e26a2932ab3e3d9d79bb5af7daf2364ca133b7
I333c810568cdc656d2e13f0eeb9511857335b834
I830bf2e679e76efe7ed9d8bb30a8d459d8b9a09a
I08d8d319d096c050ae53d90eeac293c9b1bab2bf
I445676d558e05a6c5e9dd1e76e80ba2f5e8cd6c1
I9f38515f35fcddfbdc34ae4f59ffcfc6682033d4
Ia32e581c11954163bc8ff20a7b32432a843a17b2
I07c346475fb4a294bc8eb8da8c2048cc23394e20
Ic3f2c4e5bafd3a1556412005564fc0b549e6813c
Ic68717f4410170814d3e3b141de77b35eca12f7b
Ifad79991298e9d779b38a33a270af5197d2fc060
I3060c5ba31b59666aedfafad430e21329c4479d4
I9c87282ba5819a76a6f6697a5e9de6c92d74a665
I8144e2b83748a96ab83ba14894bfa5bd59995895
I8cac84296ddb1e323f28e2476f78d0190f4a1b73
Icef2b7fa70f274f671bd1b9469eb6a333ab462f9
Idc4ceb7973d1a424834f8c2a4bc5916ef7b1e961
I1bc779e5890f6994442c562ee5abf37c06dc6d3d
Ib1161d3d8c4a9378eabf44f9de1eae9556d82643
I11a17fc105dea398140abc1a59e6355e9e55b322
I0aa523321f1eed4a0a5461b1a894452f77e6ff99
I827bd74e9892969bb4891b31af1515789fa76c1c
I1bb658339e5a6f0adb07fda3ee0bc6c03670cc09
I135261c851067a25b20b30482764b5a61145f186
I4971d605c3475949be64372dc6bd3355ed258527
I08f6a7830c4b9ad44fb96f6d304ce257a899e287
I96886f8d0f3f03905163d93c4f8f3e637d98127f
Idf2cf7f40780cf46ba95228764790b818bc72db5
Ib046fd7149d71fc62c8f2df7a9747d6b54e95138
I546ff57d76e50ad86eb5853782fdcc1f348c9f0e
I1293ecc2974bae4ad530ecb775cd19072e413c72
I8db5a202a2e63ca0a3e355a6083d426acb7342cb
I71482f9a4430a8bbcd02c954a415ff3fab2a0c8f
I0c5656798444764b52f4d9d8889f831d674a1610
I2ac4ccd967a7a47284573c9b645055ebeca4635c
I93b830d42e7d44435c790832c11d5d38861015e0
If24985f47cc9fcd6c2eb84a73165878559008120
I39b908451f4b678ed63b872ffc46590e2c728b2c
If7e5622067c77c4c8d64ee466d1c62e4dcb0e53f
If58279329f6c76978223369a2d08d47a7b1e3579
I3621a0a204360343ba684e2217a68a6ef51a7850
I358909c38b0771fe0283386841b6123ddb2931a6
I2e8fcb4a15af3a66331a921d378bfd5d2dfe4533
I0bbad22c5fed8c32dd7de387194e94c8d4b9ad75
I34f51c6202cbaa805c496360e8dbd391890decc6
Iaab82ea254444bba233cd9ebad93d38426154ca4
Ica2565031546a8281820c17edc95d258ad31ba65
Ic282fff7167a8224ec1a1e0f7c247a9c8d73f390
Icdc707a9438adae5c8bb2d9b97af95e65c4bc2a1
I26c4e1fb971f22ec721e1dddcce6b301f5db6608
I8882575084eefa6a23bd59b8d2a54a53d793298e
Ic1e7cf4da4d2bf73d889aee7bac6cf260b26d532
I472b9da10e9f45b3c254f8440526f3f9d5116931
I1560e0df1c89be1db1e1d1aeaaeef2e6da5f85c1
Ie2842b28648084d8970329d7c76fcf0d0666a847
I2dccaedb559fc5e9865b137f980024e068bdafa3
I61a3d44f81d829f1ef22fd3044c65e4b3518b92b
I0d657c2e0d47af32cc35cd66b902be72952e5438
I22d2dbdae5c9c859d4baca2bdb7bea71da09b85b
I8c99fcbbf2f7229728236ae1059f4c9cb8dbb065
I1bb841e463658c8db42eb15ecc1687262df86a2f

Change-Id: Ib04f801b0085e7d5da3d73594bbc41c281b06026
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
2013-03-07 15:25:37 -08:00
Xiaozhe Shi
2f24cb771c msm: power: Revert LGE power patches
Revert the following customer changes in order to clean up this
branch.

This reverts commit 33ddf5a9eaa031c00b00846458f2ba534e6807b8.
This reverts commit f17df2402b795faf2c03de6d8a5b12378674f3be.
This reverts commit 0a488464c03806e1f775c35d7b2c83650eaab4ef.
This reverts commit 23d2a7cd02b081e1cf2578c02b7ecd3a65319d4e.
This reverts commit 90e32fa7cb701d922825e40b82b566e4af843ea2.
This reverts commit 7346d0fbd3c338d55330766e0f1867f19b364fed.
This reverts commit eb59bf66db9f2ca6e79552f4f72aa56f8c6abd27.
This reverts commit 9c56de000bb2390191fa2ddaea738e6d3e8f5d4f.
This reverts commit 7a72ca62c3f64c7b914edd8d9dbb75933b3c845e.
This reverts commit 76048dac5085eca4459ee5ea5dd4876a1f518cfa.
This reverts commit bfafe7ec7cdeef5b44b32f9aa6ee03beba2020e0.
This reverts commit e346f7a7b8ead1bbb106f4eb1e766c49407bffde.
This reverts commit 1265899c012a463cb0521ed73f2abe057692a9db
This reverts commit 1ff608a341b87defa586ca4a24d0bd89abfdfbb3
This reverts commit 5f030effc8c1af159ad13e77d4c169f037d6c9e4.
This reverts commit 19c87ddde66fd6aad61a60e466a75af235fca7f9.
This reverts commit 905eac978c30c96c5d12a81c1f6968d8c57a645f.
This reverts commit 1bd7c8643cdd8fdc7cf649ec465cc454315a6753.
This reverts commit 69f1730e0d249bad3b4f0fc0f94d917c16c3df19.
This reverts commit 2073afb7ee8b3f80f1f3184bd7ac99ead581adee
This reverts commit 8126554cf049d13f4dd2d815d86ea289efdc6f3a.
This reverts commit 45ccbb53cfc227fd3811e71b0bd813432c96ee9e
This reverts commit 325995993eb806285a35381e803ed5432fe5a93a.
This reverts commit 84cf5a3959bcf412c4b48f8a29b8255c18602d1b.
This reverts commit 839d5a50c761787ded6b8558fa37696be81196fe.
This reverts commit d4b1fb57463d04aeca5ae9bfd2181faa016f97c2.
This reverts commit 2ab04b0deb912a5a52899a50ced73e36974a6a00.
This reverts commit 3a3de0ee621625c8767e0d3c7106c52fcf834499.
This reverts commit f278add027723a90b11c9a97f6d1b09c1aaec795.
This reverts commit 1a749b700752efcc8d832f7b83554df2771dce53.

Change-Id: I21863586360b6bc57dd6d631c34725bea963cffa
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
2013-03-07 15:25:37 -08:00
Dixon Peterson
3bf1a685c4 diag: Add diag changes to bring diag up to date
diag on the A-Family mainline is out of date. Create a commit
to bring diag up to date.

Change-Id: Ie24780b4b83a3cb378326357d70785a590167447
Signed-off-by: Dixon Peterson <dixonp@codeaurora.org>
2013-03-07 15:25:31 -08:00
Pavankumar Kondeti
7b4715f931 USB: msm_otg: Increase data contact detection timeout
Battery charging specification allows data contact detection (DCD)
timeout to be any value between 300 and 900 msec.  As DCD is reliably
working, increase the timeout for detecting slow cable insertion cases.
DCD would fail with ACA-dock and ACA-A + HS/FS device.  Use 750 msec
as timeout.  The 150 msec (900 - 750) safe guard time compensates the
time taken from session valid to DCD enable.  Decrese the DCD polling
period from 100 msec to 50 msec to exit DCD state quickly.

The 150 msec safe guard time compensates the time taken from session valid
to starting charger detection procedure.

CRs-Fixed: 437484
(cherry picked from commit ebb4a2d613128a2db288402bc834622a36e71956)

Conflicts:

	drivers/usb/otg/msm_otg.c

Change-Id: I0e014d2ae0f9e00eaba179af2244924cf4561c90
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
2013-03-07 15:25:16 -08:00
Carl Vanderlip
af49c64a88 msm_fb: Calibration config API
Add definition for struct to be used in post processing calibration API.
Needed by OEM calibration tool to provide better support of post processing
features.

Change-Id: I40760a85bb58730bfe64469ecf3e2ab3b6e7609e
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
(cherry picked from commit e8ed5ec0bd9fd5b298464b7f08b5807afa3291a8)
2013-03-07 15:25:03 -08:00
Ajit Khare
ddfce255b8 msm: Add support for amr-wb+ non-tunnel driver
-Non tunnel playback is use case where compressed
 data is sent to driver(for decoding) and
 caller expects PCM data back from the driver.
-Add non-tunnel driver for amr-wb+.
-Add support for amr-wb+ in asm driver

Change-Id: I266e70dff0466a20b0435da840a31a8a1774cf35
Signed-off-by: Ajit Khare <ajitk@codeaurora.org>
2013-03-07 15:25:01 -08:00
Laura Abbott
7229a452a3 gpu: ion: Add flag for forcing contiguous allocations
Previously, a parameter was added to secure heaps to only
allow secure allocations. Some clients still require
non-secure contiguous allocations even though the SMMU is
supported. Add support for those clients to force contiguous
allocations to go through.

Change-Id: I0d18d8a9ed3ab267b55c84c4ad160f8cec2c2b32
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2013-03-07 15:24:58 -08:00
Sushil Chauhan
bfc2a09803 Revert "msm_mdp: Add Venus color format support to MDP header file"
This reverts commit 355c0ffe69b90b08ec4621bdb0964b42c6bb7eed.
Reverting it, as this is being handled in Display HAL now.

Change-Id: I2d807a17193c8d579bb23378e59817374d3f4ad7
Signed-off-by: Sushil Chauhan <sushilchauhan@codeaurora.org>
2013-03-07 15:24:52 -08:00
Ken Zhang
4ba4e55f0f msm: display: panel frame rate report
Add metadata ioctl for retrieving panel frame rate.
Get ready to remove reserved fields usage.

Change-Id: I51a4aed9d85efd5f83a184100b6a3dc682c7a67c
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
2013-03-07 15:24:42 -08:00
Ken Zhang
d614c3611e 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>
2013-03-07 15:24:35 -08:00
Amy Maloche
258d6bf0bf mfd: pm8038: Add structure to support pm8xxx vibrator
Although not in internal reference designs, customers
may need to use pmic based vibrator instead of isa1200.

CRs-fixed: 416276

Change-Id: I190840eee4862ac82c5120501748b795e6d0c760
Signed-off-by: Amy Maloche <amaloche@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:24:27 -08:00
Liam Mark
bd6b0d88ed android/lowmemorykiller: Selectively count free CMA pages
In certain memory configurations there can be a large number of
CMA pages which are not suitable to satisfy certain memory
requests.

This large number of unsuitable pages can cause the
lowmemorykiller to not kill any tasks because the
lowmemorykiller counts all free pages.
In order to ensure the lowmemorykiller properly evaluates the
free memory only count the free CMA pages if they are suitable
for satisfying the memory request.

Change-Id: I7f06d53e2d8cfe7439e5561fe6e5209ce73b1c90
CRs-fixed: 437016
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2013-03-07 15:24:17 -08:00
Hamad Kadmany
a452cd5bc4 tsif: Add option to inverse tsif signals
TSIF signals (clock, data, enable and sync) may be configured
to be inversed at TSIF unit input. This is useful in case
TSIF signals from external units need to be inversed.

Change-Id: I21a5c8eca73df0f4458c0d035ef8ae90920ea0c5
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
2013-03-07 15:24:16 -08:00
Ayaz Ahmad
124d6f7020 radio: iris: Add support for RT Plus, eRT feature.
- Allow Soc to interrupt host for RT Plus, eRT data
 - Parse the RDS group for RT Plus, eRT
 - Queue the parsed data and event for RT Plus, eRT
   to upper layer
CRs-fixed: 419248

Signed-off-by: Ayaz Ahmad <aahmad@codeaurora.org>

(cherry picked from commit 89265111440674132f59c3aa2938a0aefbfc84fb)

Change-Id: I44010cebd5d7de7ae3a4b076971d24d65aa4fb91
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
2013-03-07 15:24:15 -08:00
Liron Kuch
9484341aeb media: dvb: mpq: Support new elementary stream data events
Video elemenatry stream data is usually passed from demux to a video
consumer (e.g. video decoder) in kernel-space via tunneling. However
there are cases when the video consumer is a user-space application
controlled by the middleware. This change adds support for notifying
user-space about newly available elementary stream data and
associated meta-data, using the existing events queue mechanism.

Change-Id: I1994879f9056abea389602224fa970bd029b1e56
Signed-off-by: Liron Kuch <lkuch@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:24:07 -08:00
Gilad Broner
ba38c292f7 media: dvb: External buffers support for decoder filters
Extend Demux user-space API to set decoder buffers allocated externally
by user, supporting multiple linear buffers or a single cyclic buffer.
Internal decoder buffer allocation is still supported.

Change-Id: I1df53d3961ab7934bd4a969cff1dae435ae1dfc6
Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:24:06 -08:00
Hamad Kadmany
df7e43cddf tspp: Add option to inverse tsif signals
TSIF signals (clock, data, enable and sync) may be configured
to be inversed at TSPP unit input. This is useful in case
TSIF signals from external units need to be inversed.

Change-Id: I4f0bfdc58fb8658dbf10fe3805b8787f9d36aeca
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:24:00 -08:00
Hamad Kadmany
bd24d914f8 media: dvb: Add support for external demux buffer allocation
demux input/output buffers were allocated internally by the driver,
for MPQ use-cases there's a need for user-space MPQ player to
allocate the buffers through ION driver and set them to demux
similar to the way other kinds of buffers are managed
in android multimedia stack for video

Change-Id: Ic28a279c0841fee12008cea7beac58f82409b9f9
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:23:59 -08:00
Larry Bassel
bad999e743 mm: make counts of CMA free pages correct
Both patches needed, second patch (among other things) fixes
a bug in the first.

commit 2139cbe627b8910ded55148f87ee10f7485408ed
Author: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date:   Mon Oct 8 16:32:00 2012 -0700

    cma: fix counting of isolated pages

    Isolated free pages shouldn't be accounted to NR_FREE_PAGES counter.  Fix
    it by properly decreasing/increasing NR_FREE_PAGES counter in
    set_migratetype_isolate()/unset_migratetype_isolate() and removing counter
    adjustment for isolated pages from free_one_page() and split_free_page().

    Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: Marek Szyprowski <m.szyprowski@samsung.com>
    Cc: Michal Nazarewicz <mina86@mina86.com>
    Cc: Minchan Kim <minchan@kernel.org>
    Cc: Mel Gorman <mgorman@suse.de>
    Cc: Hugh Dickins <hughd@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    [lbassel@codeaurora.org: backport from 3.7, small changes needed]
    Signed-off-by: Larry Bassel <lbassel@codeaurora.org>

commit d1ce749a0db12202b711d1aba1d29e823034648d
Author: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date:   Mon Oct 8 16:32:02 2012 -0700

    cma: count free CMA pages

    Add NR_FREE_CMA_PAGES counter to be later used for checking watermark in
    __zone_watermark_ok().  For simplicity and to avoid #ifdef hell make this
    counter always available (not only when CONFIG_CMA=y).

    [akpm@linux-foundation.org: use conventional migratetype naming]
    Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: Marek Szyprowski <m.szyprowski@samsung.com>
    Cc: Michal Nazarewicz <mina86@mina86.com>
    Cc: Minchan Kim <minchan@kernel.org>
    Cc: Mel Gorman <mgorman@suse.de>
    Cc: Hugh Dickins <hughd@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    [lbassel@codeaurora.org: backport from 3.7, small changes needed]
    Signed-off-by: Larry Bassel <lbassel@codeaurora.org>

Change-Id: I7d4f5fe0b6931192706337e0b730f43e7cccd031
Signed-off-by: Larry Bassel <lbassel@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:23:58 -08:00
Sunid Wilson
a90291cc60 msm: gemini: Support upto 64mp encoding
Redesign the output ping pong mechanism to support
upto 64mp encoding using gemini hardware.

Change-Id: Id7801861e0fe119f61a02fb3409155f312a85d21
Signed-off-by: Sunid Wilson <sunidw@codeaurora.org>
2013-03-07 15:23:54 -08:00
Shalabh Jain
1a9d9888b7 diag: Add fixes for DCI
1) Fix an issue where after running a DCI app and exiting it,
 second app does not receive any DCI data. Issue was due to
 incorrect state of a flag used by SMD channel.

2) Add a mutex around shared data structures like cumulative masks.
Multiple clients may want to change DCI mask at the same time, so
mutex will prevent any corruption

3) Add support for health commands. The client request how many logs
were dropped and received.

Change-Id: Ica12b3c93aa4dda9b04aa13cd5a9f8dbc412148c
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
2013-03-07 15:23:48 -08:00
Shalabh Jain
d133044a50 diag: Add logs & events streaming support for DCI
Diag driver is adding a new feature to stream logs & events to a
user space application on Linux processor. This will eliminate
need to connect QXDM to receive diag traffic.
This is known as Diag Consumer Interface (DCI).

Change-Id: I7983bb7d9b8a0429ebbee290868c8bd0e562953f
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
2013-03-07 15:23:47 -08:00
Vijay Krishnamoorthy
64c28c80d2 msm: kgsl: Add support to use timestamps from userspace for an issue
Use timestamp from userspace instead of incrementing context's last
issued timestamp. This allows userspace to defer submissions to KGSL.

Change-Id: I2a104f97420f73dac3bbd23464e92e6ea9d92869
Signed-off-by: Vijay Krishnamoorthy <adivarah@codeaurora.org>
Signed-off-by: Rajeev Kulkarni <krajeev@codeaurora.org>
2013-03-07 15:23:45 -08:00
Nishant Pandit
eb62561c59 msm: camera: Add support for low power configuration in camera
Camera may run in a low power background mode. Configure the sensor
to run at lowest clock and vfe to request minimum bandwidth.

Change-Id: Idf6e5fb069c5a3cdbbbddb760614fee4510d81dc
Signed-off-by: Nishant Pandit <npandit@codeaurora.org>
2013-03-07 15:23:43 -08:00
Laura Abbott
9fa56006b4 mm: Add is_cma_pageblock definition
Bring back the is_cma_pageblock definition for determining if a
page is CMA or not.

Change-Id: I39fd546e22e240b752244832c79514f109c8e84b
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:36 -08:00
Laura Abbott
23b04db439 gpu: ion: Restrict access to CP heap
On certain targets, the CP heap should only be used
for secure allocations. Add a check to determine which
targets are allowed to make non-secure allocations from
the CP heap type. Targets with this restriction will
fall back to an alternate heap.

Change-Id: Ieaa9e76cbf2dc3ea1da6f4e75a4de903c39a3077
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:34 -08:00
Laura Abbott
8acc4f0080 gpu: ion: Add support for CMA allocations in cp heap
Extend the cp heap to allow memory to be allocated from
the contiguous memory allocator (CMA) instead of from
the standard caveout region. The option to use CMA or regular
carveout memory is configured via a parameter in platform
data.

Change-Id: I9f3a169325c44230dde1d91a9cdcf613ad291df2
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:25 -08:00
Benjamin Gaignard
1382bb05d7 add CMA heap
New heap type ION_HEAP_TYPE_DMA where allocation is done with dma_alloc_coherent API.
device coherent_dma_mask must be set to DMA_BIT_MASK(32).
ion_platform_heap private field is used to retrieve the device linked to CMA,
if NULL the default CMA area is used.
ion_cma_get_sgtable is a copy of dma_common_get_sgtable function which should
be in kernel 3.5

Change-Id: I9ae54a3a021cb3513c2b0e8c58b69f3ae118561b
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
[lauraa: Fix context in ion_priv.h/ion.h and omit Makefile change for now]
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:23 -08:00
Benjamin Gaignard
522629b432 add private field in ion_heap and ion_platform_heap structure
copy private field from platform configuration to internal heap structure.

Change-Id: Ia7571d88fc2f72f5d655fb6f6b54fde389d96c85
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
[laura: Rebase context fixes]
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:23 -08:00
Benjamin Gaignard
bf8847b852 fix ion_platform_data definition
fix ion_platform_heap to make is use an usual way in board configuration file.

Change-Id: I8686108a9fe0aa2ba9f9c84990d555f947f78f86
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
[lauraa: Fixup msm board files]
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:22 -08:00
Laura Abbott
c1386f095a common: DMA-mapping: Add strongly ordered memory attribute
Strongly ordered memory is occasionally needed for some DMA
allocations for specialized use cases. Add the corresponding
DMA attribute.

Change-Id: Idd9e756c242ef57d6fa6700e51cc38d0863b760d
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:21 -08:00
Marek Szyprowski
0f53e5abb2 common: DMA-mapping: add DMA_ATTR_NO_KERNEL_MAPPING attribute
This patch adds DMA_ATTR_NO_KERNEL_MAPPING attribute which lets the
platform to avoid creating a kernel virtual mapping for the allocated
buffer. On some architectures creating such mapping is non-trivial task
and consumes very limited resources (like kernel virtual address space
or dma consistent address space). Buffers allocated with this attribute
can be only passed to user space by calling dma_mmap_attrs().

Change-Id: Id12b93fa2b02d5f3d01ab48eb61cda79f533d695
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:21 -08:00
Mitchel Humpherys
42fab316dd ion: isolate msm-specific ion extensions
This is another step in the process of isolating msm-specific ion
features from stock ion.

Change-Id: I3a437dbc618cb70859126c81596373338ad06500
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:17 -08:00
Mitchel Humpherys
5ebf0bb53c ion: change ion kernel map function to not take flags argument
Buffer flags are going to be specified at allocation time rather than
map time. This removes the flags argument from the ion kernel map
function.

Change-Id: Ib983ecd0dcd7befb36287ae7037c71d4ca475f90
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:16 -08:00
Mitchel Humpherys
fefa905b39 ion: remove obsolete ion flags
The symbols CACHED and UNCACHED have been replaced by ION_FLAG_CACHED
upstream. This removes them from the kernel.

Change-Id: I90c33c293f56792131fc6bd490fe041b5798ac20
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:23:16 -08:00
Hanumant Singh
19cc56631b ion: Port heap mask change to ion
Heap mask field passes as argument at allocation time to specify ion
heap.

Change-Id: I6951da81b11bfcb0e006d2539c1707aabbb12db6
Signed-off-by: Hanumant Singh <hanumant@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:22:59 -08:00
Mitchel Humpherys
fcbad45999 ion: change ion buffer flags
This syncs up our ion buffer flags in ion.h with upstream (using
ION_FLAG_CACHED instead of CACHED and UNCACHED).

Change-Id: I2e07a3acba230a86817182677fa2394fa846fd7e
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
2013-03-07 15:22:58 -08:00
Sushil Chauhan
a88adab7d4 msm_mdp: Add Venus color format support to MDP header file
Add Venus color format which is supported by newer platforms.

Change-Id: I2451375b9fb91cd4d4776cae4c5444902db5479e
Signed-off-by: Sushil Chauhan <sushilchauhan@codeaurora.org>
2013-03-07 15:22:48 -08:00
Srinu Gorle
28dc3d59fc msm: vidc: Adds VUI timing info support for AVC encoding.
Poor video quality is observed as VUI fps information is not present in
the encoded bit stream. Add support for VUI timing info in video driver
and an additional V4L2 control to set from user space.

CRs-Fixed: 399017
Signed-off-by: Srinu Gorle <sgorle@codeaurora.org>
Conflicts:

	include/linux/videodev2.h

Change-Id: I970d4c479009da2d08531a9e9b8489a84cc5d44c
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:22:35 -08:00
Srinu Gorle
4e78af1c80 msm: vidc: Adds AU delimiter support for AVC.
Add new V4L2 control to set AU delimiter for AVC.

Change-Id: I8c72cb89f18c9b2b550b906d797eafb73ac4ebbe
CRs-Fixed: 389030
Signed-off-by: Srinu Gorle <sgorle@codeaurora.org>
Signed-off-by: Neha Pandey <nehap@codeaurora.org>
2013-03-07 15:22:32 -08:00
Azam Sadiq Pasha Kapatrala Syed
7ef421aecd msm: camera: Recover camera when sensor is pulled off.
This patch ensures that camera is recovered by propogating the
error event when sensor is pulled off.

Change-Id: I4147e02342c2538db8337d3e04735cf97b2d7635
Signed-off-by: Azam Sadiq Pasha Kapatrala Syed <akapatra@codeaurora.org>
2013-03-07 15:22:15 -08:00