Commit graph

592721 commits

Author SHA1 Message Date
Linux Build Service Account
842f75d2bb Merge "drm/msm: update HDMI AVI infoframe during HDR playback" 2017-08-11 16:23:52 -07:00
Linux Build Service Account
6949010ef3 Merge "drm/msm: update CSC matrix during HDR playback" 2017-08-11 16:23:51 -07:00
Linux Build Service Account
de1f4ef405 Merge "drm/msm: change CSC matrix selection logic for CDM block" 2017-08-11 16:23:50 -07:00
Linux Build Service Account
9a34ec62d2 Merge "ASoC: msm: qdsp6v2: assign decoder memory to ADSP" 2017-08-11 16:23:49 -07:00
Linux Build Service Account
7ed24b74a1 Merge "Revert "input: misc: hbtp_input: fix memory corruption in list"" 2017-08-11 16:23:48 -07:00
Linux Build Service Account
623fc3cf14 Merge "power: qcom: smb-lib: optimize parallel current limiting with PD" 2017-08-10 21:36:38 -07:00
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
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
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
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
Linux Build Service Account
c75201c442 Merge "ARM: dts: msm: Config sleep state for wlan bootstrap pin for msm8996" 2017-08-08 09:02:05 -07:00
Linux Build Service Account
e9249c8420 Merge "msm: ipa3: fix compatibility with ipa kernel tests" 2017-08-08 09:02:04 -07:00
Tanya Dixit
2fff7d7ae6 ASoC: msm: qdspv2: Fix missing mutex unlock in LSM client driver
Fix missing mutex unlock in LSM client driver.

CRs-fixed: 2059497
Change-Id: If5da5ab2eeb424b86c0e6476b69aa6ed36e7ea72
Signed-off-by: Tanya Dixit <tdixit@codeaurora.org>
2017-08-08 13:20:40 +05:30