diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-01-08 18:57:21 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-01-08 18:57:21 -0800 |
| commit | a37a401ec7fcc36733819dc435ae93c76538fa1e (patch) | |
| tree | 99744e758c672bac68f7f2a6dd8871d4a29e0586 | |
| parent | abe01b5b507ac7316db7c1de1d009ee44f4bd692 (diff) | |
| parent | 0402a2094d464f64454fdb6b05e93819a947750d (diff) | |
| download | novatek_touch-a37a401ec7fcc36733819dc435ae93c76538fa1e.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3
SBMerger: 478053055
Change-Id: If37f3db1a9e7459935c7b2996322d328cf55ef36
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | nt36xxx/nt36xxx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nt36xxx/nt36xxx.c b/nt36xxx/nt36xxx.c index 7c557a5..9cb5783 100644 --- a/nt36xxx/nt36xxx.c +++ b/nt36xxx/nt36xxx.c @@ -2008,9 +2008,9 @@ static irqreturn_t nvt_ts_work_func(int irq, void *data) if (ts->pen_format_id == 0x01) { pen_ktime = ktime_get(); scnprintf(trace_tag, sizeof(trace_tag), - "stylus-active: TH %lld BH %lld delta %lld us\n", - ktime_to_us(ts->timestamp), ktime_to_us(pen_ktime), - ktime_us_delta(pen_ktime, ts->timestamp)); + "stylus-active: IN_TS=%lld TS=%lld DELTA=%lld ns.\n", + ktime_to_ns(ts->timestamp), ktime_to_ns(pen_ktime), + ktime_to_ns(ktime_sub(pen_ktime, ts->timestamp))); ATRACE_BEGIN(trace_tag); // report pen data pen_x = (uint32_t)(point_data[67] << 8) + (uint32_t)(point_data[68]); @@ -2086,9 +2086,9 @@ static irqreturn_t nvt_ts_work_func(int irq, void *data) } else if (ts->pen_active) { // pen_format_id = 0xFF and a pen was reporting pen_ktime = ktime_get(); scnprintf(trace_tag, sizeof(trace_tag), - "stylus-inactive: TH %lld BH %lld delta %lld us\n", - ktime_to_us(ts->timestamp), ktime_to_us(pen_ktime), - ktime_us_delta(pen_ktime, ts->timestamp)); + "stylus-inactive: IN_TS=%lld TS=%lld DELTA=%lld ns.\n", + ktime_to_ns(ts->timestamp), ktime_to_ns(pen_ktime), + ktime_to_ns(ktime_sub(pen_ktime, ts->timestamp))); ATRACE_BEGIN(trace_tag); input_set_timestamp(ts->pen_input_dev, ts->timestamp); |