Commit graph

593231 commits

Author SHA1 Message Date
Linux Build Service Account
0cae764de2 Merge "ARM: dts: msm: Add fastrpc vmid flag for sdm660" 2017-08-10 21:36:37 -07:00
Linux Build Service Account
8ca20aea7e Merge "msm: adsprpc: Separate hyp_assign call for audio remote heap protection" 2017-08-10 21:36:36 -07:00
Linux Build Service Account
d73a32a9d1 Merge "Revert "ARM: dts: msm: enable ADV7535 on MSM8996Pro Auto CDP lite platform"" 2017-08-10 21:36:35 -07:00
Linux Build Service Account
ae773d7171 Merge "drm/msm: only set need cdm for INTF3" 2017-08-10 21:36:35 -07:00
Linux Build Service Account
1f01c0ba90 Merge "msm: camera: Avoid deadlock for vb2 operations using separate lock" 2017-08-10 21:36:34 -07:00
Linux Build Service Account
75f68f1cdb Merge "power: qpnp-fg-gen3: adjust recharge voltage during soft JEITA charge done" 2017-08-10 21:36:32 -07:00
Abhinav Kumar
86d73ba300 drm/msm: update HDMI AVI infoframe during HDR playback
Add support to update the HDMI AVI infoframe to use
BT2020 encoding during HDR video playback.

This is required as per the spec to ensure that the
AVI infoframe correctly indicates the content being
shown.

Also make sure to change and restore the YCC
quantization bits in case of override.

Change-Id: Iadacc2fac6252b5f5cbfcc39a122118f738d3113
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-10 17:41:03 -07:00
Abhinav Kumar
5920f5fe3c drm/msm: update CSC matrix during HDR playback
The CSC matrix used in the CDM block should be
updated to BT2020 format from the default value
during HDR video playback.

Add support in the SDE driver to enable switching
CSC matrix of CDM block to BT2020 during start of
HDR playback and restore it at the stop of the
playback to the default CSC.

Change-Id: Ic589380188ddef8ada2c8bbc0ca945bb1f319c85
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-10 17:40:43 -07:00
Abhinav Kumar
5e05fc53d8 drn/msm/sde: add BT709, BT2020 CSC matrix definitions
Currently only BT601 CSC matrix is available for use
in the SDE driver.

Add BT709, BT2020 CSC matrix definitions to SDE driver.
These shall be used during different use-cases such as
HDR video playback by switching the CSC matrix based on the
use-case.

Change-Id: I70a543193d08217cbdb6c4af739b3777dde4a25d
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-10 17:40:21 -07:00
Abhinav Kumar
7c79cabfdf drm/msm: change CSC matrix selection logic for CDM block
CDM block is always using a limited quantization range
matrix.

This can be overridden to use a full range matrix if
the sink supports override capability or the mode is a
non-CEA mode.

Adjust the matrix selection logic to accommodate these
conditions.

Change-Id: I708412a923fb0d47e798f35ebe14b4c2f1a72fc9
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
2017-08-10 17:39:57 -07:00
Nicholas Troast
73cfa3e3ef power: qpnp-smb2: expose CHARGE_COUNTER prop via batt psy
CHARGE_COUNTER is a required battery power supply property. Add it.

Change-Id: Ieb9c64447f88213479ce14b738f71fa703ffc194
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-08-10 15:44:56 -07:00
Nicholas Troast
2cc64cac04 power: qpnp-smb2: use correct properties
CURRENT_MAX and VOLTAGE_MAX should be used to show the current values
for the charger. The driver currently uses them to communicate with
the USB and PD drivers.

Update the code such that USB uses SDP_CURRENT_MAX to set 500mA/900mA
current limits after enumeration and PD uses PD_VOLTAGE_MIN/MAX to set
the adapter voltage limits.

CURRENT_MAX now shows the max current that can be drawn from the charger
and VOLTAGE_MAX shows the max voltage that the charger can negotiate up
to.

CURRENT_MAX and VOLTAGE_MAX can no longer be set.

Change-Id: I660e39effc1862051cff8b9babc885d8de3f9c84
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-08-10 15:44:47 -07:00
Nicholas Troast
dcdf2ac6c1 power_supply: add properties for SDP current and PD voltage
SDP_CURRENT_MAX is used to communicate the maximum current negotiated by
the USB phy. PD_VOLTAGE_MAX is used to communicate the maximum voltage
negotiated by the PD phy. PD_VOLTAGE_MIN is used to communicate the
minimum voltage negotiated by the PD phy.

Change-Id: I8332f7072c99c2c4e009607d92ccfb47534cc23b
Signed-off-by: Nicholas Troast <ntroast@codeaurora.org>
2017-08-10 15:42:12 -07:00
Skylar Chang
a34763e5b3 msm: gsi: check channel state on timeout
In some cases of stopping a channel,
the CH CTRL interrupt arrives late even though the channel is
already stopped. This change will check the channel state after
timeout occurs.

CRs-Fixed: 2090459
Change-Id: I4b99e8fb6710dca16047025a614fb734995934a1
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
2017-08-10 11:05:12 -07:00
Tharun Kumar Merugu
0cdcf0409b msm: ADSPRPC: Use msm_ion_do_cache_op to flush userspace buffers
Remove the use of dmac_flush_range for userspace buffers and add
msm_ion_do_cache_op for flushing user space buffers.

Change-Id: Ice73eafac840bd1cabee0a2bfc8a641832a7d0c8
Acked-by: Bharath Kumar <bkumar@qti.qualcomm.com>
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-10 16:01:59 +05:30
Guchun Chen
ea3c1f1db1 Revert "ARM: dts: msm: enable ADV7535 on MSM8996Pro Auto CDP lite platform"
This reverts commit 9ec3ce38d7.

This change brings one NULL pointer in display kernel booting, which
will bring crash on msm8996 lite board. So revert this commit temporarily.

Change-Id: I7e11b78b47f0e2f2f5cc05a0220f1ff7f3a1addd
Signed-off-by: Guchun Chen <guchunc@codeaurora.org>
2017-08-10 17:52:01 +08:00
Tharun Kumar Merugu
46756eb931 ARM: dts: msm: Add fastrpc vmid flag for sdm660
Add a device specific flag for new vmid heap shared feature.

Change-Id: I9be679f9edd0048acbb057ceff4d877c630e4258
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-10 02:23:19 -07:00
Tharun Kumar Merugu
dc979af523 msm: adsprpc: Separate hyp_assign call for audio remote heap protection
Enable audio remote heap protection for separate hyp_assign call to map
HLOS buffer to ADSP_Q6_ELF VM.

Change-Id: I91a70cb8ef2c2feb2d4c398c15c220c78c96a509
Signed-off-by: Tharun Kumar Merugu <mtharu@codeaurora.org>
2017-08-10 02:21:58 -07:00
Jack Pham
4a32817fda usb: pd: force disconnect upon unexpected SRC->SNK transition
While in Source mode, a notification that a source is attached
is unexpected. In this case, force a disconnect in order to
clean up state and turn off VBUS and Vconn.

Change-Id: Ie576feeb7622376e8cb0dd8454b626b3b24b190b
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-08-09 22:07:48 -07:00
Ziqi Chen
44530217e8 usb: dwc3: msm: clear resource on dwc3_msm_probe defer
In dwc3_msm_probe, when need to defer probe, driver should clear
resource has been allocated and de-attach the children device.
of_platform_depopulate is the complement of of_platform_populate to
remove devices created here. And driver also needs to destroy
workqueue in error case.

Change-Id: I234198eba45842f86c736dd459096ebc4fced807
Signed-off-by: Ziqi Chen <ziqic@codeaurora.org>
2017-08-09 20:23:50 -07:00
Linux Build Service Account
39b5f76de0 Merge "msm: kgsl: Correctly update fence_name for larger timestamp" 2017-08-09 14:17:14 -07:00
Linux Build Service Account
25918b144a Merge "cnss2: Disable BDF bypass by default" 2017-08-09 14:17:13 -07:00
Yue Ma
c876f88cef cnss2: Enhance debugfs support for device boot
Add the debugfs support for full power on sequence to boot device,
full power off sequence to shutdown device, PCIe link up/down and
powering off device only. It can help to debug device boot issues
without WLAN host driver.

Change-Id: Ie1e65719eff0918cf64d1f0926ec36cad1c869e6
CRs-fixed: 2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-09 13:32:10 -07:00
Jack Pham
3b399a415c usb: pd: avoid missed connection notification
In the disconnect handler of usbpd_sm(), pd->current_pr is
already set to PR_NONE, so there is no reason to set it again.
This helps for cases where a quick reconnection notification
just arrived and sets the variable to either PR_SRC or PR_SINK
but the disconnect handling clears it resulting in nothing to
be done the next time work is scheduled.

Change-Id: Ia88520149905989a3b3efb94361670760b79c0bd
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2017-08-09 09:51:43 -07:00
Yuan Zhao
13af4ecf92 drm/msm: only set need cdm for INTF3
Only HDMI INTF3 should need cdm block, other
INTFs do not need cdm.

Change-Id: Iff355dae456ed432efd84dff72ec85b83dbb93f2
Signed-off-by: Yuan Zhao <yzhao@codeaurora.org>
2017-08-09 08:17:07 -07:00
Linux Build Service Account
bb7cc76a8f Merge "qpnp-smb2: enable/disable sw jeita using a property" 2017-08-09 03:18:21 -07:00
Linux Build Service Account
772f98746e Merge "power: power_supply: add property for sw based JEITA" 2017-08-09 03:18:21 -07:00
Linux Build Service Account
ea1901ceaf Merge "ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver" 2017-08-09 03:18:20 -07:00
Abhilash Kumar
a9d6b142e1 msm: kgsl: Correctly update fence_name for larger timestamp
Since 'timestamp' is of unsigned int type, for larger timestamp
the format specifier %d can show negative values. Fix this by
using %u format specifier for timestamp.

Change-Id: I621dfd4843099cb27436006500fe3342d1d5ddf4
Signed-off-by: Abhilash Kumar <krabhi@codeaurora.org>
2017-08-09 02:17:09 -07:00
aranja
d55fd79eb9 Revert "input: misc: hbtp_input: fix memory corruption in list"
This reverts commit e6b2b08383f6 ("input: misc: hbtp_input: fix
memory corruption in list_del_entry"). This change introduces
kernel crash during adb reboot.

Change-Id: Ia6f53e2d62344b9f08eb056d901ae39e884e3a96
Signed-off-by: Vevek Venkatesan <vevekv@codeaurora.org>
2017-08-08 23:53:51 -07:00
Abhijeet Dharmapurikar
713a3c923a qpnp-smb2: enable/disable sw jeita using a property
Provide support to enable/disable sw jeita using a power supply
property.

Change-Id: Id1c2a4bcd8caece5ed7591dc5ab5bf3ac2207cba
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-09 09:55:38 +05:30
Ashay Jaiswal
04e88147af power: power_supply: add property for sw based JEITA
Add power_supply property to enable/disable software based
JEITA charging.

Change-Id: I9fca73c1de524e78c3df83b02a9f5a64488eaae0
Signed-off-by: Ashay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
2017-08-09 09:47:17 +05:30
Yue Ma
b958ebeb2a cnss2: Disable BDF bypass by default
Disable sending dummy BDF(board data file). Enforce to use real BDF
by default.

Change-Id: Ib0cf267af8ddea8a702f8ac6774063466094f52e
CRs-fixed: 2059087
Signed-off-by: Yue Ma <yuem@codeaurora.org>
2017-08-08 19:46:17 -07:00
Linux Build Service Account
603df3f744 Merge "power: qpnp-fg-gen3: add support for skew in capacity learning algorithm" 2017-08-08 16:24:56 -07:00
Linux Build Service Account
38c099f001 Merge "usb: dwc3: initialize ep0_usb_req.request.dma to avoid crash" 2017-08-08 16:24:55 -07:00
Linux Build Service Account
ee4d827cf0 Merge "ASoC: msm: qdsp6v2: Modify name for Tertiary mi2s RX and TX" 2017-08-08 16:24:54 -07:00
Linux Build Service Account
fbf1286c9c Merge "drm/msm: free the IRQ during GPU cleanup" 2017-08-08 16:24:53 -07:00
Linux Build Service Account
488414b696 Merge "ion: Correct argument of Set/ClearPagePrivate of secure CMA" 2017-08-08 16:24:53 -07:00
Linux Build Service Account
0975f1e0b7 Merge "defconfig: msm: Enable PAN emulation" 2017-08-08 16:24:51 -07:00
Linux Build Service Account
01dc1a95a2 Merge "cnss2: Suspend PCIe link and power off device after PCIe probe" 2017-08-08 16:24:50 -07:00
Linux Build Service Account
1b6a7f7ebb Merge "defconfig: msm: enable fstack-protector-strong" 2017-08-08 09:02:18 -07:00
Linux Build Service Account
cb10479cfa Merge "Merge android-4.4@59ff2e1 (v4.4.78) into msm-4.4" 2017-08-08 09:02:16 -07:00
Linux Build Service Account
0257f99a4d Merge "defconfig: msm: Disable DEVPORT config for msm8998" 2017-08-08 09:02:15 -07:00
Linux Build Service Account
f43cc12df0 Merge "msm: sensor: ois: add conditional check for ioctl" 2017-08-08 09:02:14 -07:00
Linux Build Service Account
7dbbe1224f Merge "msm: ipa3: Fix IPA aggregation force close call" 2017-08-08 09:02:12 -07:00
Linux Build Service Account
7195c28d78 Merge "USB: f_ccid: Unblock ccid_ctrl_read() during disconnect" 2017-08-08 09:02:11 -07:00
Linux Build Service Account
6757ffb0b5 Merge "icnss: Delay Shutdown/reinit sequence for all cases" 2017-08-08 09:02:10 -07:00
Linux Build Service Account
6f1a42cbc9 Merge "qcom: qpnp-haptic: Disable haptics when enable time specified is zero" 2017-08-08 09:02:09 -07:00
Linux Build Service Account
a42bc74491 Merge "drm/msm: reset TMDS clock ratio bit when disabling scrambler" 2017-08-08 09:02:08 -07:00
Linux Build Service Account
6d76f20002 Merge "ARM: dts: msm: Set FDE key size to 256bit for sdm630" 2017-08-08 09:02:07 -07:00