diff options
| author | Wendly Li <wendlyli@google.com> | 2022-07-21 08:20:32 +0000 |
|---|---|---|
| committer | Wendly Li <wendlyli@google.com> | 2022-07-25 06:10:21 +0000 |
| commit | c9ead8b17e5782936b78d0c7472192e4f9319a01 (patch) | |
| tree | abd1ea3bf4e5461f916c3d84168df0e97a415fc8 /goodix_ts_core.c | |
| parent | e788d534c077d25514338001eae58ce4918649bc (diff) | |
| download | goodix_touch-c9ead8b17e5782936b78d0c7472192e4f9319a01.tar.gz | |
touch/goodix: Fix the unit of major and minor
Bug: 214118815
Test: Check the size of major/minor is correct
Change-Id: If6a86e194a7ee9f1818573694813433c4740e613
Signed-off-by: Wendly Li <wendlyli@google.com>
Diffstat (limited to 'goodix_ts_core.c')
| -rw-r--r-- | goodix_ts_core.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/goodix_ts_core.c b/goodix_ts_core.c index 3cfe0bf..22eb14f 100644 --- a/goodix_ts_core.c +++ b/goodix_ts_core.c @@ -1162,6 +1162,14 @@ static int goodix_parse_dt_resolution( ts_err("failed get panel-max-p, use default"); board_data->panel_max_p = GOODIX_PEN_MAX_PRESSURE; } + + ret = of_property_read_u32( + node, "goodix,panel-height-mm", &board_data->panel_height_mm); + if (ret) { + ts_err("failed get panel-height-mm"); + return ret; + } + return 0; } @@ -1359,6 +1367,8 @@ static void goodix_ts_report_finger( struct input_dev *dev = cd->input_dev; unsigned int touch_num = touch_data->touch_num; int i; + int panel_height_mm = cd->board_data.panel_height_mm; + int panel_height_pixel = cd->board_data.panel_max_y + 1; mutex_lock(&dev->mutex); @@ -1382,9 +1392,11 @@ static void goodix_ts_report_finger( input_report_abs( dev, ABS_MT_PRESSURE, touch_data->coords[i].p); input_report_abs(dev, ABS_MT_TOUCH_MAJOR, - touch_data->coords[i].major); + (touch_data->coords[i].major * panel_height_pixel) / + (10 * panel_height_mm)); input_report_abs(dev, ABS_MT_TOUCH_MINOR, - touch_data->coords[i].minor); + (touch_data->coords[i].minor * panel_height_pixel) / + (10 * panel_height_mm)); input_report_abs(dev, ABS_MT_ORIENTATION, (touch_data->coords[i].angle * 2048) / 45); } else { @@ -1413,6 +1425,8 @@ static void goodix_ts_report_finger_goog( struct goog_touch_interface *gti = cd->gti; unsigned int touch_num = touch_data->touch_num; int i; + int panel_height_mm = cd->board_data.panel_height_mm; + int panel_height_pixel = cd->board_data.panel_max_y + 1; goog_input_lock(gti); @@ -1429,10 +1443,12 @@ static void goodix_ts_report_finger_goog( gti, dev, ABS_MT_POSITION_Y, coord->y); goog_input_report_abs( gti, dev, ABS_MT_PRESSURE, coord->p); - goog_input_report_abs( - gti, dev, ABS_MT_TOUCH_MAJOR, coord->major); - goog_input_report_abs( - gti, dev, ABS_MT_TOUCH_MINOR, coord->minor); + goog_input_report_abs(gti, dev, ABS_MT_TOUCH_MAJOR, + (touch_data->coords[i].major * panel_height_pixel) / + (10 * panel_height_mm)); + goog_input_report_abs(gti, dev, ABS_MT_TOUCH_MINOR, + (touch_data->coords[i].minor * panel_height_pixel) / + (10 * panel_height_mm)); goog_input_report_abs( gti, dev, ABS_MT_ORIENTATION, (coord->angle * 2048) / 45); } else { @@ -1899,8 +1915,8 @@ static int goodix_ts_input_dev_config(struct goodix_ts_core *core_data) input_set_abs_params( input_dev, ABS_MT_POSITION_Y, 0, ts_bdata->panel_max_y, 0, 0); input_set_abs_params(input_dev, ABS_MT_PRESSURE, 0, 255, 0, 0); - input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, 4096, 0, 0); - input_set_abs_params(input_dev, ABS_MT_TOUCH_MINOR, 0, 4096, 0, 0); + input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, 0, ts_bdata->panel_max_y, 0, 0); + input_set_abs_params(input_dev, ABS_MT_TOUCH_MINOR, 0, ts_bdata->panel_max_x, 0, 0); input_set_abs_params(input_dev, ABS_MT_ORIENTATION, -4096, 4096, 0, 0); input_set_abs_params( input_dev, ABS_MT_TOOL_TYPE, MT_TOOL_FINGER, MT_TOOL_PALM, 0, 0); |