Input: MT - make slot assignment work for overcovered solutions (73e8a8e7) · Commits · 戴 / test

The recent inclusion of a deassignment cost in the slot assignment algorithm did not properly account for the corner cases where the solutions are overcovered. This change makes sure the resulting assignment is unique, allocating new slots when necessary. Signed-off-by:

Henrik Rydberg <rydberg@bitmath.org> Signed-off-by:

Benjamin Tissoires <benjamin.tissoires@redhat.com> Acked-by:

Hans de Goede <hdegoede@redhat.com> Signed-off-by:

Dmitry Torokhov <dmitry.torokhov@gmail.com>

drivers/input/input-mt.c

+17 −9

Original line number	Diff line number	Diff line
		@@ -365,29 +365,37 @@ static void input_mt_set_slots(struct input_mt *mt,
		int *slots, int num_pos)
		{
		struct input_mt_slot *s;
		int w = mt->red, p;
		int *w = mt->red, j;

		for (p = slots; p != slots + num_pos; p++)
		*p = -1;
		for (j = 0; j != num_pos; j++)
		slots[j] = -1;

		for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {
		if (!input_mt_is_active(s))
		continue;
		for (p = slots; p != slots + num_pos; p++)
		if (*w++ < 0)
		*p = s - mt->slots;

		for (j = 0; j != num_pos; j++) {
		if (w[j] < 0) {
		slots[j] = s - mt->slots;
		break;
		}
		}

		w += num_pos;
		}

		for (s = mt->slots; s != mt->slots + mt->num_slots; s++) {
		if (input_mt_is_active(s))
		continue;
		for (p = slots; p != slots + num_pos; p++)
		if (*p < 0) {
		*p = s - mt->slots;

		for (j = 0; j != num_pos; j++) {
		if (slots[j] < 0) {
		slots[j] = s - mt->slots;
		break;
		}
		}
		}
		}

		/**
		* input_mt_assign_slots() - perform a best-match assignment

Admin message