From 323ab260fbcb8e9f4e0d3aa01d5a2f6e8b98c1f4 Mon Sep 17 00:00:00 2001 From: litong Date: Sun, 26 Apr 2020 19:55:53 +0800 Subject: [PATCH] Modify the value of synaptics major and minor TP: Take the larger value of x_width and y_width as the major, and the smaller value as the minor. Change-Id: I15461a286210e8925d5a497e9005d4dd1c624352 Reviewed-on: https://gerrit.mot.com/1542931 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jialei Hao Reviewed-by: Jianqi Yang Submit-Approved: Jira Key --- .../touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c index 06b65e57c52d..d2036c6868a3 100644 --- a/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c +++ b/drivers/input/touchscreen/synaptics_tcm_mmi_v2/synaptics_touch.c @@ -768,8 +768,13 @@ static void touch_report(void) case GLOVED_FINGER: x = object_data[idx].x_pos; y = object_data[idx].y_pos; - minor = object_data[idx].x_width * bdata->size_to_pixel_multiple_factor; - major = object_data[idx].y_width * bdata->size_to_pixel_multiple_factor; + if (object_data[idx].x_width > object_data[idx].y_width) { + minor = object_data[idx].y_width * bdata->size_to_pixel_multiple_factor; + major = object_data[idx].x_width * bdata->size_to_pixel_multiple_factor; + } else { + minor = object_data[idx].x_width * bdata->size_to_pixel_multiple_factor; + major = object_data[idx].y_width * bdata->size_to_pixel_multiple_factor; + } if (bdata->swap_axes) { temp = x; x = y;