1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/input/input-mt.c b/drivers/input/input-mt.c
index 53eaf89f2db5..d398f1321f14 100644
--- a/drivers/input/input-mt.c
+++ b/drivers/input/input-mt.c
@@ -79,6 +79,8 @@ int input_mt_init_slots(struct input_dev *dev, unsigned int num_slots,
         }
         if (flags & INPUT_MT_DIRECT)
                 __set_bit(INPUT_PROP_DIRECT, dev->propbit);
+        if (flags & INPUT_MT_SEMI_MT)
+                __set_bit(INPUT_PROP_SEMI_MT, dev->propbit);
         if (flags & INPUT_MT_TRACK) {
                 unsigned int n2 = num_slots * num_slots;
                 mt->red = kcalloc(n2, sizeof(*mt->red), GFP_KERNEL);
@@ -246,20 +248,24 @@ void input_mt_sync_frame(struct input_dev *dev)
 {
         struct input_mt *mt = dev->mt;
         struct input_mt_slot *s;
+        bool use_count = false;
 
         if (!mt)
                 return;
 
         if (mt->flags & INPUT_MT_DROP_UNUSED) {
                 for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {
-                        if (s->frame == mt->frame)
+                        if (input_mt_is_used(mt, s))
                                 continue;
                         input_mt_slot(dev, s - mt->slots);
                         input_event(dev, EV_ABS, ABS_MT_TRACKING_ID, -1);
                 }
         }
 
-        input_mt_report_pointer_emulation(dev, (mt->flags & INPUT_MT_POINTER));
+        if ((mt->flags & INPUT_MT_POINTER) && !(mt->flags & INPUT_MT_SEMI_MT))
+                use_count = true;
+
+        input_mt_report_pointer_emulation(dev, use_count);
 
         mt->frame++;
 }