github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 07:03:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: virtio: virtio_input: Do not call input_mt_init_slots in virtinput_cfg_abs

Browse Source 
This is a partial (except #include) revert of aog/1153134.

Our Android change is no longer needed since upstream
added moultiouch support:

https://lore.kernel.org/linux-input/20210115002623.8576-1-vasyl.vavrychuk@opensynergy.com/

Bug: 143488374
Test: boot sdk_phone64_x86_x64, check multitouch works
Test: when both input_mt_init_slots calls are removed
Test: multitouch stops working (expected).
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I04a1c481b78c25a841fbae109feb73bcc0ff6548
This commit is contained in:
Roman Kiryanov 2021-07-19 16:09:18 -07:00
parent 91bf8d6cac
commit 1e794cfa30
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/virtio/virtio_input.c
View File

@ -4,7 +4,6 @@
#include <linux/virtio_config.h>
#include <linux/input.h>
#include <linux/slab.h>
#include <linux/input/mt.h>
#include <uapi/linux/virtio_ids.h>
#include <uapi/linux/virtio_input.h>
@ -182,15 +181,6 @@ static void virtinput_cfg_abs(struct virtio_input *vi, int abs)
virtio_cread_le(vi->vdev, struct virtio_input_config, u.abs.flat, &fl);
input_set_abs_params(vi->idev, abs, mi, ma, fu, fl);
input_abs_set_res(vi->idev, abs, re);
if (abs == ABS_MT_TRACKING_ID) {
unsigned int slot_flags =
test_bit(INPUT_PROP_DIRECT, vi->idev->propbit) ?
INPUT_MT_DIRECT : 0;
input_mt_init_slots(vi->idev,
ma, /* input max finger */
slot_flags);
}
}
static int virtinput_init_vqs(struct virtio_input *vi)