Commit Graph
321987 Commits
Author SHA1 Message Date
Linux Build Service Account 40407b489f Merge "Bluetooth:Show bonding dialog if neither side requires no bonding" 2012-12-06 01:08:18 -08:00
Linux Build Service Account bd19c58a16 Merge "msm: Enable MM heap to use CMA" 2012-12-06 01:08:05 -08:00
Linux Build Service Account c247cef80d Merge "gpu: ion: Don't assume that heaps must be removed" 2012-12-06 01:08:02 -08:00
Linux Build Service Account 127fb85dbf Merge "msm: video: wfd: Clean up controls" 2012-12-06 01:07:48 -08:00
Linux Build Service Account 70fc340778 Merge "msm: 8960ab: Add gfx3d axi clock and port to footswitch data" 2012-12-05 23:07:31 -08:00
Linux Build Service Account f32e8bd5ef Merge "msm: 8960ab: Correct graphics 3d port representation" 2012-12-05 23:07:29 -08:00
Linux Build Service Account 5fe0cd1311 Merge "USB: dwc3-msm: Add SW workaround for SSPHY suspend bug" 2012-12-05 23:07:17 -08:00
Linux Build Service Account e101453257 Merge "msm: Add Secure Monitor Call module for fsm9xxx" 2012-12-05 23:06:56 -08:00
Linux Build Service Account a9d2abb516 Merge "defconfig: msm8960: Enable CMA" 2012-12-05 23:06:44 -08:00
Linux Build Service Account 58eaae039a Merge "gpu: ion: Flush new pages" 2012-12-05 23:06:42 -08:00
Linux Build Service Account 1f75843c7e Merge "arm/dt: msm8974: Remove regulator-s2-ao device node" 2012-12-05 23:06:22 -08:00
Linux Build Service Account c932193df9 Merge "arm/dt: msm8974: acpuclock: Remove acpuclock pm8941_s2 regulator usage" 2012-12-05 23:06:17 -08:00
Linux Build Service Account 9eeade909e Merge "arm/dt: msm8974: Remove always-on and parent properties for RPM regulators" 2012-12-05 23:06:14 -08:00
Linux Build Service Account fac1e451e8 Merge "Revert "android/lowmemorykiller: Only consider gfp_mask free pages"" 2012-12-05 20:28:21 -08:00
Linux Build Service Account b02ae381b9 Merge "msm_fb: display: delete dsi clock control from cmdlist_commit" 2012-12-05 20:28:05 -08:00
Linux Build Service Account 7391548bf4 Merge "qseecom: Tie performance request to client handle" 2012-12-05 20:27:54 -08:00
Linux Build Service Account a18fa4bb8a Merge "msm: kgsl: Remove incorrect check for current context" 2012-12-05 20:27:35 -08:00
Linux Build Service Account 3075e85bbb Merge "msm: mdss: hdmi: Add support for dynamic resolution change" 2012-12-05 20:27:17 -08:00
Linux Build Service Account 97a9129111 Merge "msm: mdss: support panel resolution changes" 2012-12-05 20:27:14 -08:00
Linux Build Service Account 1e4bd6acbd Merge "ondemand: Add support to consider other cpu load when scaling frequencies" 2012-12-05 20:26:50 -08:00
Linux Build Service Account 12d73c08ce Merge "msm: mdss: fix iommu fault due to incorrect buffer unmap" 2012-12-05 20:26:29 -08:00
Deva Ramasubramanian 31efdf865f msm: video: wfd: Clean up controls
Rename some controls for consistent naming.  Also use QCOM defined
controls rather than reusing ones intended for other vendors.

Change-Id: I684f31b59a69362dd44cebb7a59a3ef2b78297aa
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2012-12-05 18:37:16 -08:00
Linux Build Service Account 1aeade00ad Merge "msm: 8226: Add board file support for SPS" 2012-12-05 18:03:35 -08:00
Linux Build Service Account 9b41efc793 Merge "msm: camera: Update the bus vector entry for video usecase." 2012-12-05 18:03:22 -08:00
Linux Build Service Account 3eda4a946c Merge "mm: split_free_page ignore memory watermarks for CMA" 2012-12-05 18:03:06 -08:00
Linux Build Service Account bd66444b9f Merge "msm: vidc: Add error check before calling release buffers to FW" 2012-12-05 18:02:49 -08:00
Linux Build Service Account 0af18780d5 Merge "ASoC: msm: Add supplementary service for VoLTE and voice call on 8974" 2012-12-05 18:02:28 -08:00
Linux Build Service Account 66b139e928 Merge "ASoC: wcd9xxx: Fix virtual port issue for I2S" 2012-12-05 18:01:54 -08:00
Linux Build Service Account 292cdebad6 Merge "arm/dt: msm9625: add smem" 2012-12-05 18:01:37 -08:00
Linux Build Service Account 0d2921b2f5 Merge "gpu: ion: Fix a contiguous system heap crash" 2012-12-05 18:01:17 -08:00
Linux Build Service Account 6239a547d9 Merge "msm: video: wfd: Change log message priority" 2012-12-05 18:00:51 -08:00
Linux Build Service Account 99743e097c Merge "slimbus: Refine scope of controller and scheduler mutex locks" 2012-12-05 18:00:26 -08:00
Laura Abbott 24f8c3ce87 msm: Enable MM heap to use CMA
Enable the MM heap on 8960, 8930, and 8064 to use CMA
instead of carved out memory. All allocations will come
from memory reserved as CMA instead of carved out memory.

Change-Id: I6190144564ce263fdad9ec74a85cfefca6089a0d
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2012-12-05 17:35:37 -08:00
Laura Abbott 956de1908d gpu: ion: Don't assume that heaps must be removed
The current check on Ion heaps is too restrictive. It assumes that
all heaps specified with a base address (implying it is a carveout
like heap) must have memory removed with memblock_remove. This is
not a valid assumption. Newer memory managment techniques such
as CMA will not remove memory from the memblock. Ensuring that
memory is properly removed can and should be done elsewhere.
Remove this check entirely.

Change-Id: If2ef1fe2b7f1d3e34c7f48a1a48d2f566d916f93
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2012-12-05 17:35:26 -08:00
Laura Abbott 08988247be defconfig: msm8960: Enable CMA
Enable the option to turn on the Contiguous Memory Allocator
(CMA) feature. This will allow clients to allocate large chunks
of memory without having to remove it from the system.

Change-Id: Ifc18c34d15f94e5d113d576bc32dbb0cf78f9c49
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2012-12-05 17:32:24 -08:00
Laura Abbott 60c92c79ef gpu: ion: Flush new pages
When allocating pages that are intended to be used for
uncached allocations, we need to ensure the cache is coherent;
there may be outstanding data in the cache related to those
pages. Ensure cache coherency by flushing each of the pages.

Change-Id: I4b89c799b5c099f6c050d8ddd758bdb368c07c08
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
2012-12-05 17:32:23 -08:00
Stephen Boyd 9071e51f27 msm: 8960ab: Add gfx3d axi clock and port to footswitch data
On 8960ab we need to assert and deassert the resets to the gfx3d
axi clock in addition to the core and interface clocks. Add the
clock to the list so that we reset the gfx core appropriately.

We also need to halt both bus ports, therefore add the second bus
port id.

Change-Id: I05943906ed124658ab643d9bbce2bbca3f526a78
CRs-Fixed: 428846
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-12-05 16:51:32 -08:00
Linux Build Service Account 434ba2b468 Merge "Revert "Bluetooth: Initiate dedicated bonding if pin/key missing on remote device"" 2012-12-05 15:57:28 -08:00
Linux Build Service Account 146ea6ad20 Merge "sched: fix rq->lock recursion" 2012-12-05 15:57:16 -08:00
Linux Build Service Account 2c6fbc4871 Merge "fs/buffer.c: Revoke LRU when trying to drop buffers" 2012-12-05 15:56:57 -08:00
Linux Build Service Account 217cc0a0bc Merge "8930: Add support for using CMA with ion heaps" 2012-12-05 15:56:55 -08:00
Linux Build Service Account c79e21ba8a Merge "8064: Add support for using CMA with ion heaps" 2012-12-05 15:56:53 -08:00
Linux Build Service Account dcb37656ab Merge "8960: Add support for using CMA with Ion heaps" 2012-12-05 15:56:51 -08:00
Linux Build Service Account 66a881c59a Merge "msm: kgsl: Add a ftrace event for GPU busy" 2012-12-05 15:56:39 -08:00
Linux Build Service Account 23145b4ba6 Merge "msm: kgsl: Remove an uneeded register write for A3XX GPUs" 2012-12-05 15:56:37 -08:00
Linux Build Service Account 7472daef55 Merge "msm: kgsl: Add a ftrace event for register writes" 2012-12-05 15:56:36 -08:00
Linux Build Service Account 786741445c Merge "msm: Add camera special effects" 2012-12-05 15:56:24 -08:00
Rohit Vaswani 5fd759eb8d msm: Add Secure Monitor Call module for fsm9xxx
This driver utilizes the ION driver and the SCM module to
allow users to transfer data between the non-secure and secure
environments on the FSM9XXX platform.

Change-Id: I1afcc78e691e46dd11afeceb70a5097c0e979b5c
Acked-by: Jennifer L. Zenner <jzenner@qti.qualcomm.com>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
2012-12-05 15:36:23 -08:00
Gagan Mac 620f6f8880 msm: 8960ab: Correct graphics 3d port representation
The graphics 3d ports need to be separately halted/unhalted.
Facilitate this by mapping to separate external IDs.

Change-Id: I9261996894bee4baf7cf273cc380ca142b82021f
Signed-off-by: Gagan Mac <gmac@codeaurora.org>
2012-12-05 15:59:23 -07:00
Liam Mark d47b12e245 Revert "android/lowmemorykiller: Only consider gfp_mask free pages"
This reverts commit f714041949.

Iterating the page free_list without locking it can crash
because the list can change while being iterated.

Iterating the page free_list while locking it can cause a
deadlock.

CRs-fixed: 427061
Change-Id: I9e89b121e7436c8dcac922ad973d8c06a31ce9b0
Signed-off-by: Liam Mark <lmark@codeaurora.org>
2012-12-05 13:14:38 -08:00