浏览代码

Input: alps - do not use input-mt finger tracking for semi-mt devices

With the recent process_bitmap() changes all semi-mt devices always report
the first finger down in slot 0, so stop using input-mt finger tracking
for these.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Hans de Goede 10 年之前
父节点
当前提交
1662c03387
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      drivers/input/mouse/alps.c

+ 6 - 2
drivers/input/mouse/alps.c

@@ -524,7 +524,11 @@ static void alps_report_semi_mt_data(struct psmouse *psmouse, int fingers)
 		priv->second_touch = -1;
 		priv->second_touch = -1;
 	}
 	}
 
 
-	alps_report_mt_data(psmouse, (fingers <= 2) ? fingers : 2);
+	if (fingers >= 1)
+		alps_set_slot(dev, 0, f->mt[0].x, f->mt[0].y);
+	if (fingers >= 2)
+		alps_set_slot(dev, 1, f->mt[1].x, f->mt[1].y);
+	input_mt_sync_frame(dev);
 
 
 	input_mt_report_finger_count(dev, fingers);
 	input_mt_report_finger_count(dev, fingers);
 
 
@@ -2826,7 +2830,7 @@ static void alps_set_abs_params_mt(struct alps_data *priv,
 
 
 	input_mt_init_slots(dev1, MAX_TOUCHES,
 	input_mt_init_slots(dev1, MAX_TOUCHES,
 			    INPUT_MT_POINTER | INPUT_MT_DROP_UNUSED |
 			    INPUT_MT_POINTER | INPUT_MT_DROP_UNUSED |
-				INPUT_MT_TRACK | INPUT_MT_SEMI_MT);
+				INPUT_MT_SEMI_MT);
 }
 }
 
 
 static void alps_set_abs_params_v7(struct alps_data *priv,
 static void alps_set_abs_params_v7(struct alps_data *priv,