git: de20578e6dd2 - stable/13 - evdev: force no fuzz for autogenerated single touch compat events.

[Vladimir Kondratyev]

The branch stable/13 has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=de20578e6dd2f0354024e1e1527b38cf62e28e1a

commit de20578e6dd2f0354024e1e1527b38cf62e28e1a
Author:     Vladimir Kondratyev <wulf at FreeBSD.org>
AuthorDate: 2021-08-24 22:45:50 +0000
Commit:     Vladimir Kondratyev <wulf at FreeBSD.org>
CommitDate: 2021-09-07 23:57:34 +0000

    evdev: force no fuzz for autogenerated single touch compat events.
    
    As fuzz has already been applied on multitouch event processing.
    This allows to remove existing workaround for double fuzz procesing.
    
    (cherry picked from commit 314913ed7c6e6e1b7c80a1063620f478961419b7)
---
 sys/dev/evdev/evdev.c    | 2 +-
 sys/dev/evdev/evdev_mt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c
index 8483faee8d6b..d6f6cc2e003f 100644
--- a/sys/dev/evdev/evdev.c
+++ b/sys/dev/evdev/evdev.c
@@ -876,6 +876,7 @@ evdev_send_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
 
 	EVDEV_LOCK_ASSERT(evdev);
 
+	evdev_modify_event(evdev, type, code, &value);
 	sparse =  evdev_sparse_event(evdev, type, code, value);
 	switch (sparse) {
 	case EV_REPORT_MT_SLOT:
@@ -939,7 +940,6 @@ evdev_push_event(struct evdev_dev *evdev, uint16_t type, uint16_t code,
 		evdev_restore_after_kdb(evdev);
 	}
 
-	evdev_modify_event(evdev, type, code, &value);
 	if (type == EV_SYN && code == SYN_REPORT &&
 	    bit_test(evdev->ev_abs_flags, ABS_MT_SLOT))
 		evdev_mt_sync_frame(evdev);
diff --git a/sys/dev/evdev/evdev_mt.c b/sys/dev/evdev/evdev_mt.c
index 0ededf053f36..0b5d2cb6bb85 100644
--- a/sys/dev/evdev/evdev_mt.c
+++ b/sys/dev/evdev/evdev_mt.c
@@ -196,7 +196,7 @@ evdev_support_mt_compat(struct evdev_dev *evdev)
 			evdev_support_abs(evdev, evdev_mtstmap[i][1],
 			    evdev->ev_absinfo[evdev_mtstmap[i][0]].minimum,
 			    evdev->ev_absinfo[evdev_mtstmap[i][0]].maximum,
-			    evdev->ev_absinfo[evdev_mtstmap[i][0]].fuzz,
+			    0,
 			    evdev->ev_absinfo[evdev_mtstmap[i][0]].flat,
 			    evdev->ev_absinfo[evdev_mtstmap[i][0]].resolution);
 }