From 1e794cfa307689e2fd70f48a08157acc30d5add4 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Mon, 19 Jul 2021 16:09:18 -0700 Subject: [PATCH] ANDROID: virtio: virtio_input: Do not call input_mt_init_slots in virtinput_cfg_abs 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 Change-Id: I04a1c481b78c25a841fbae109feb73bcc0ff6548 --- drivers/virtio/virtio_input.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/virtio/virtio_input.c b/drivers/virtio/virtio_input.c index 2e51018a467b..ce51ae165943 100644 --- a/drivers/virtio/virtio_input.c +++ b/drivers/virtio/virtio_input.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -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)