summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-19Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3android-t-qpr3-beta-3_r0.5android-t-qpr3-beta-3_r0.4android-t-qpr3-beta-3_r0.3android-t-qpr3-beta-3.1_r0.5android-t-qpr3-beta-3.1_r0.4android-t-qpr3-beta-3.1_r0.3android-t-qpr3-beta-2_r0.4android-t-qpr3-beta-2_r0.3android-13.0.0_r0.92android-13.0.0_r0.85android-13.0.0_r0.84android-13.0.0_r0.83android-13.0.0_r0.82android-13.0.0_r0.127android-13.0.0_r0.126android-13.0.0_r0.125android-13.0.0_r0.124android-13.0.0_r0.123android-13.0.0_r0.121android-13.0.0_r0.117android-13.0.0_r0.116android-13.0.0_r0.115android-13.0.0_r0.114android-13.0.0_r0.113android-13.0.0_r0.112android-13.0.0_r0.107android-13.0.0_r0.106android-13.0.0_r0.105android-13.0.0_r0.104android-13.0.0_r0.103android-13.0.0_r0.100android-gs-tangorpro-5.10-android13-qpr3android-gs-raviole-5.10-t-qpr3-beta-3android-gs-raviole-5.10-t-qpr3-beta-2android-gs-raviole-5.10-android13-qpr3android-gs-pantah-5.10-t-qpr3-beta-3android-gs-pantah-5.10-android13-qpr3android-gs-lynx-5.10-android13-qpr3android-gs-felix-5.10-android13-qpr3-candroid-gs-felix-5.10-android13-qpr3android-gs-bluejay-5.10-t-qpr3-beta-3android-gs-bluejay-5.10-t-qpr3-beta-2android-gs-bluejay-5.10-android13-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: If4fd49d427561272170d506b26d7fc3e6f162b90 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-02-14gti: Correct the probe sequence to initialize the input.android-t-qpr3-beta-2_r0.5android-t-qpr3-beta-1_r0.5android-gs-pantah-5.10-t-qpr3-beta-2android-gs-pantah-5.10-android13-qpr3-beta1Super Liu
Bug: 244371891 Change-Id: Iceba50d04b6a7af72e035c3b7b9601ee9c33cf3f Signed-off-by: Super Liu <supercjliu@google.com>
2023-02-14gti: Correct the probe sequence to initialize the input.android-13.0.0_r0.91android-13.0.0_r0.77android-13.0.0_r0.75android-13.0.0_r0.74android-13.0.0_r0.73android-13.0.0_r0.70android-13.0.0_r0.69android-13.0.0_r0.68android-gs-tangorpro-5.10-android13-d2android-gs-raviole-5.10-android13-qpr2android-gs-pantah-5.10-android13-qpr2android-gs-lynx-5.10-android13-qpr2-bandroid-gs-bluejay-5.10-android13-qpr2Super Liu
Bug: 244371891 Change-Id: Iceba50d04b6a7af72e035c3b7b9601ee9c33cf3f Signed-off-by: Super Liu <supercjliu@google.com>
2023-01-08Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3android-t-qpr3-beta-1_r0.4android-t-qpr3-beta-1_r0.3android-t-qpr3-beta-1_r0.1android-13.0.0_r0.93android-gs-raviole-5.10-android13-qpr3-beta1android-gs-felix-5.10-android13-d3android-gs-bluejay-5.10-android13-qpr3-beta1PixelBot AutoMerger
SBMerger: 478053055 Change-Id: Ie4cb9d5c1baa014429a45d1a39976c430688f667 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-01-01Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I62aad251bb6d0949b47987957c8343d08b427365 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-30gti: add atrace for offload input report.android-t-qpr2-beta-3_r0.5android-t-qpr2-beta-3_r0.4android-t-qpr2-beta-3_r0.3android-t-qpr2-beta-3.2_r0.6android-t-qpr2-beta-3.2_r0.5android-13.0.0_r0.64android-gs-raviole-5.10-android13-qpr2-betaandroid-gs-pantah-5.10-t-qpr2-beta-3.2android-gs-pantah-5.10-android13-qpr2-betaandroid-gs-bluejay-5.10-t-qpr2-beta-3android-gs-bluejay-5.10-android13-qpr2-betaSuper Liu
Bug: 263444046 Change-Id: If852d8ca661db78712e44bb8305537ddf415688b Signed-off-by: Super Liu <supercjliu@google.com>
2022-12-29gti: Support procfs to get heatmap.Super Liu
Introduce proc to resolve the sysfs PAGE_SIZE limitation. Bug: 262796907 Change-Id: I2c2c12f8360fc46895416efd7d94d5e1e7570546 Signed-off-by: Super Liu <supercjliu@google.com> (cherry picked from commit 23cdd7fcb0f9eddab00a081064c0df6cc8ca2db0)
2022-12-29gti: change the default mode for dumpstate logs.Super Liu
Bug: 262796907 Change-Id: I23470887a3f06df17f496ef8c68c3571a158f1ec Signed-off-by: Super Liu <supercjliu@google.com>
2022-12-25Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I4dc01b1065bcad695baf3615f874ca33f5d0d6f1 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-26gti: change the default mode for dumpstate logs.Super Liu
Bug: 262796907 Change-Id: I23470887a3f06df17f496ef8c68c3571a158f1ec Signed-off-by: Super Liu <supercjliu@google.com>
2022-12-22gti: Support procfs to get heatmap.Super Liu
Introduce proc to resolve the sysfs PAGE_SIZE limitation. Bug: 262796907 Change-Id: I2c2c12f8360fc46895416efd7d94d5e1e7570546 Signed-off-by: Super Liu <supercjliu@google.com>
2022-12-19Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I772a824b4676fe21c87103d1d576c31e77c7102d Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-14gti: Add logs for unexpected tool_type by vendor driverSuper Liu
Bug: 261924220 Change-Id: I99ace4cb0764330c50f8e9418a3dca0699a86802 Signed-off-by: Super Liu <supercjliu@google.com>
2022-12-11Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: Ibf6dc5365bf79d348897f98a6cc2c4e4e91cebd6 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-09gti: Add logs for unexpected tool_type by vendor driverSuper Liu
Bug: 261924220 Change-Id: I99ace4cb0764330c50f8e9418a3dca0699a86802 Signed-off-by: Super Liu <supercjliu@google.com>
2022-12-06touch/gti: Add touch index in GTI logMason Wang
Bug: 261127820 Test: Verify pass by checking the log information including gti.0/gti.1 Signed-off-by: Mason Wang <masonwang@google.com> Change-Id: I63ef469c30b28a7915f8a46d25827c85933bd83a
2022-12-06touch/gti: Add touch index in GTI logMason Wang
Bug: 261127820 Test: Verify pass by checking the log information including gti.0/gti.1 Signed-off-by: Mason Wang <masonwang@google.com> Change-Id: I63ef469c30b28a7915f8a46d25827c85933bd83a
2022-12-06touch: gti: Added wakelock_nosync supportandroid-t-qpr2-beta-2_r0.5android-t-qpr2-beta-2_r0.3Ravi Jain
1. Merged resume and suspend work to update_state_work. 2. Modified wakelock logic to not require use of cancel_work_sync. 3. Added error_handling to wakelock calls. 4. Replaced use of completion bit to use of flush_workqueue in wakelock. Test: Tested on L10 and T6 for resume/suspend. Bug: 230827813 Change-Id: Ife27f2ea03aa578a40c14496340b84ff5533ab42 Signed-off-by: Ravi Jain <raviajain@google.com>
2022-12-06touch: gti: Added wakelock_nosync supportRavi Jain
1. Merged resume and suspend work to update_state_work. 2. Modified wakelock logic to not require use of cancel_work_sync. 3. Added error_handling to wakelock calls. 4. Replaced use of completion bit to use of flush_workqueue in wakelock. Test: Tested on F10 for resume/suspend. Bug: 230827813 Change-Id: Ife27f2ea03aa578a40c14496340b84ff5533ab42 Signed-off-by: Ravi Jain <raviajain@google.com>
2022-12-06touch: gti: Fix spi write error.Ravi Jain
Fix errors caused by offload_report when device is going to suspend. Test: Flashed on L10 to check suspend/resume operations Bug: 260946570 Change-Id: I9460c7f4a8656abfd90aea0b0db015a236a2cd06 Signed-off-by: Ravi Jain <raviajain@google.com>
2022-12-06touch: gti: Fix spi write error.Ravi Jain
Fix errors caused by offload_report when device is going to suspend. Test: Flashed on L10 to check suspend/resume operations Bug: 260946570 Change-Id: I9460c7f4a8656abfd90aea0b0db015a236a2cd06 Signed-off-by: Ravi Jain <raviajain@google.com>
2022-12-06gti: replace manual_sensing_lock by input_process_lockdavidycchen
To protect the interrupt and userspace commands read the heatmap simultaneously. Bug: 260785497 Test: read heatmap by adb commands. Signed-off-by: davidycchen <davidycchen@google.com> Change-Id: I7b54997d7d3edc7c9ea73a37d4045c5b3803d1a8 (cherry picked from commit 8445f5d91ab1f7b066057d39b46918b13493c2c4)
2022-12-05Merge "Merge android13-gs-pixel-5.10-tm-qpr2 into ↵Joey Lin
android13-gs-pixel-5.10-tm-qpr3" into android13-gs-pixel-5.10-tm-qpr3
2022-12-04Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: Ia9233ba10943b73b42d7ff39164ccd26d066ead5 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-05touch/gti: Add a new line after showing SS dataMason Wang
1.Add a new line after showing SS data. 2.Correct the remain maximum number of bytes when call scnprintf(). Bug: 226475119 Test: Verify pass by checking the SS data format in the touch dumpstate. Change-Id: Ib574635e3a8131da98f4b70578bb7ab80b06df1d Signed-off-by: Mason Wang <masonwang@google.com>
2022-12-04Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: Ib8ef1aabeba6027cfd77a50a3c51da77f0fda75d Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-02gti: replace manual_sensing_lock by input_process_lockdavidycchen
To protect the interrupt and userspace commands read the heatmap simultaneously. Bug: 260785497 Test: read heatmap by adb commands. Signed-off-by: davidycchen <davidycchen@google.com> Change-Id: I7b54997d7d3edc7c9ea73a37d4045c5b3803d1a8
2022-11-30touch/gti: Only handle display state if changedMason Wang
The display driver has new power control design for refresh rate, clock and bus. So panel_bridge_enable/panel_bridge_disable will be called frequently. But the touch driver only needs to handle display state if changed. Bug: 253330479 Test: Build pass. Signed-off-by: Mason Wang <masonwang@google.com> Change-Id: Ide46b623c51240fed0755b123c7ff9026b15e040
2022-11-30touch/gti: Add a new line after showing SS dataMason Wang
1.Add a new line after showing SS data. 2.Correct the remain maximum number of bytes when call scnprintf(). Bug: 226475119 Test: Verify pass by checking the SS data format in the touch dumpstate. Change-Id: Ib574635e3a8131da98f4b70578bb7ab80b06df1d Signed-off-by: Mason Wang <masonwang@google.com>
2022-11-30touch/gti: Only handle display state if changedandroid-t-qpr2-beta-2_r0.4Mason Wang
The display driver has new power control design for refresh rate, clock and bus. So panel_bridge_enable/panel_bridge_disable will be called frequently. But the touch driver only needs to handle display state if changed. Bug: 253330479 Test: Build pass. Signed-off-by: Mason Wang <masonwang@google.com> Change-Id: Ide46b623c51240fed0755b123c7ff9026b15e040
2022-11-29touch_offload: fix mixed use register_chrdev and cdev_addWendly Li
The register_chrdev and cdev_add will both add cdev device. They can't be used at the same time. This code will cause a race condition as well. When register_chrdev and device_create were run and before running cdev_add, the char devcie already can be opened. But we can't get correct offload context inside touch_offload_open at this moment. We can only get correct offload context after running cdev_add. So this is a race condition. If twoshay open offload dev before running cdev_add, the code will use an invalid pointer to run mutex_init. So we must run cdev_add before device_create. This can prevent the code to access an invalid pointer. Bug: 255257453 Bug: 237225174 Test: Run setprop ctl.stop twoshay ; rmmod touch_driver ; setprop ctl.start twoshay ; insmod touch_driver Change-Id: I8d9cb9ec23b8621a800127f0140e40a11d4f5e02 Signed-off-by: Wendly Li <wendlyli@google.com>
2022-11-29touch/gti: fully remove sysfs when removing gtiWendly Li
Bug: 255257453 Test: Run rmmod touch_driver && insmod touch_driver.ko Change-Id: I6023f1add1ce8624f76caf16ea78e906fba763d0 Signed-off-by: Wendly Li <wendlyli@google.com>
2022-11-27Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I3a24114d6158f289907b7c637541cb0d0a3c503c Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-11-24touch/gti: release all fingers when the device suspendsdavidycchen
Release all finger when the device suspends by GTI and also clear the slots information. Bug: 260020612 Test: suspend/resume the device. Change-Id: I5b70b34d92028713813c45443ae3d2b133cb4f39 Signed-off-by: davidycchen <davidycchen@google.com>
2022-11-24touch/gti: release all fingers when the device suspendsandroid-t-qpr2-beta-1_r0.6android-gs-pantah-5.10-t-qpr2-beta-1davidycchen
Release all finger when the device suspends by GTI and also clear the slots information. Bug: 260020612 Test: suspend/resume the device. Change-Id: I5b70b34d92028713813c45443ae3d2b133cb4f39 Signed-off-by: davidycchen <davidycchen@google.com>
2022-11-20Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I6094159d75936e4fe8bb1d189adaa2e4b9288f89 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-11-18touch: Add fw_grip and fw_palm sysfs nodeRavi Jain
Modify grip_enabled and palm_enabled respectively. Test: Use adb commands to check state change of fw_grip and fw_palm while starting and stopping twoshay. Bug: 245052175 Bug: 245053548 Signed-off-by: Ravi Jain <raviajain@google.com> Change-Id: I0e2bd60e6e8e40fd8594f958648b8617e5ccb48f
2022-11-13Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I50b13f1ea8bdef8eb97a7e7834623c42fc45f391 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-11-11touch/TBN: Double check the value of aoc2ap_gpio when timeoutandroid-t-qpr2-beta-1_r0.5android-t-qpr2-beta-1_r0.4android-gs-raviole-5.10-t-qpr2-beta-1android-gs-bluejay-5.10-t-qpr2-beta-1Mason Wang
To verify the value of aoc2ap_gpio again when TBN operation is timeout to judge the AP requests/releases bus successfully or not. Bug: 257076750 Test: Basic touch operation and wake-up gesture are working well Signed-off-by: Mason Wang <masonwang@google.com> Change-Id: I5a895b9360c7abbb7b9b502862a1212ca2e7175a
2022-11-02touch/gti: Correct the typo of firmware status enumerationMason Wang
Using GTI_FW_STATUS_XXX instead of GTI_FW_STATUE_XXX Bug: 256987566 Test: Build pass Signed-off-by: Mason Wang <masonwang@google.com> Change-Id: I689d09f7ba66323f7f95d8445c8922eaf88cb3f5
2022-10-21touch/gti: Transport touch_offload driver/stylus contextSteve Pfetsch
In order to support touch_offload's exposure of context information from touch drivers, the google_touch_interface requires new APIs through which to plumb the data. "GTI_CMD_GET_CONTEXT_DRIVER" and "GTI_CMD_GET_CONTEXT_STYLUS" enable drivers to populate some or all of the respective context information. Bug: 203628075 Signed-off-by: Steve Pfetsch <spfetsch@google.com> Change-Id: I9dce8259427ff44ab3b9878f21b8e5eb0e4659ad
2022-10-19Merge android13-gs-pixel-5.10-gs101-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr2Lucas Wei
Conflicts: goog_touch_interface.c goog_touch_interface.h Bug: 238399460 Change-Id: I97e1daaeecb8291ce16c13a7a163adb38a5bfa1d Signed-off-by: Lucas Wei <lucaswei@google.com>
2022-10-18touch/gti: adjust the output format width by size.Super Liu
Bug: 201610482 Signed-off-by: Super Liu <supercjliu@google.com> Change-Id: Ic973d6f3b3bf5d4c25c9dc35ff25e178b913d9b0
2022-10-18heatmap: add vb2_queue_release in module removedavidycchen
Call vb2_queue_release in remove function to avoid any invalid-access after the module is removed. Bug: 250687758 Test: reboot test 2000 rounds. Signed-off-by: davidycchen <davidycchen@google.com> Change-Id: Ie88b4b53d8e2faa0661bfbd64579185d9888f2ad
2022-10-17touch/gti: Add frame index into atrace.Super Liu
Bug: 201610482 Signed-off-by: Super Liu <supercjliu@google.com> Change-Id: I4e7d83bf526085f9680f8fb1659862b80431e592
2022-10-17touch/gti: Support custom offload device name from DT.Super Liu
Bug: 201610482 Signed-off-by: Super Liu <supercjliu@google.com> Change-Id: If5a28dfdcecc3b8b87280e85d4f43d659df1803b
2022-09-29touch/gti: fix data racingWendly Li
Bug: 249183376 Test: cat /sys/devices/virtual/goog_touch_interface/gti.0/ms_base Change-Id: I92c8277465290288c5b1e767491ed8bf2c57cb57 Signed-off-by: Wendly Li <wendlyli@google.com>
2022-09-21touch/gti: Support pm qos.android-t-qpr1-beta-3_r0.5android-t-qpr1-beta-3.1_r0.1android-13.0.0_r0.60android-13.0.0_r0.55android-13.0.0_r0.50android-gs-pantah-5.10-t-qpr1-beta-3android-gs-pantah-5.10-android13-qpr1-beta-3android-gs-pantah-5.10-android13-qpr1Super Liu
Bug: 201610482 Signed-off-by: Super Liu <supercjliu@google.com> Change-Id: I47604343ce0abe90b107ed6b77307d62e6216e50
2022-09-15touch/gti: Support pm qos.android-t-qpr1-beta-3_r0.4android-t-qpr1-beta-3_r0.3android-13.0.0_r0.59android-13.0.0_r0.58android-13.0.0_r0.54android-13.0.0_r0.53android-13.0.0_r0.49android-13.0.0_r0.48main-16k-gs-raviole-5.10android-gs-raviole-5.10-android13-qpr1-beta-3android-gs-raviole-5.10-android13-qpr1android-gs-bluejay-5.10-android13-qpr1-beta-3android-gs-bluejay-5.10-android13-qpr1Super Liu
Bug: 201610482 Signed-off-by: Super Liu <supercjliu@google.com> Change-Id: I47604343ce0abe90b107ed6b77307d62e6216e50
2022-09-14touch: common: fix double includes of heatmap.hWill McVicker
Need to add an #ifndef check for this header to prevent double includes. Bug: 246007821 Test: verify touch on oriole Fixes: d307b1ba0326 ("ftm5: enable DMA mode") Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: Ibe7f5c685820391990e776fff7d432532f1cc4a2 (cherry picked from commit 1fc68d4659cf586a825d2715d624eb360393505e)