Re: [PATCH v2 1/3] Input: goodix - fix reported range
From: Bastien Nocera <hadess@hadess.net>
Date: 2017-11-14 14:09:00
On Tue, 2017-11-14 at 13:42 +0100, Marcin Niestroj wrote:
Touchscreen with x and y resolution should report (0:x-1), (0:y-1) as
I would say that the coordinates are 0-indexed.
it's range. Fix driver to do that.
"its".
Signed-off-by: Marcin Niestroj <redacted>
Fixes: ca96ea86eed4 ("Input: add driver for the Goodix touchpanel")I'm not sure that a Fixes is necessary for the original inclusion of the driver, is it? Otherwise you're always fixing the inclusion of the driver. Looks good otherwise.
quoted hunk ↗ jump to hunk
--- Changes v1 -> v2: patch splitted off from patch 3 (suggested by Bastien) drivers/input/touchscreen/goodix.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)diff --git a/drivers/input/touchscreen/goodix.cb/drivers/input/touchscreen/goodix.c index 69d0b8cbc71f..7896097ca69b 100644--- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c@@ -587,8 +587,8 @@ static void goodix_read_config(structgoodix_ts_data *ts) dev_warn(&ts->client->dev, "Error reading config (%d), using defaults\n", error); - ts->abs_x_max = GOODIX_MAX_WIDTH; - ts->abs_y_max = GOODIX_MAX_HEIGHT; + ts->abs_x_max = GOODIX_MAX_WIDTH - 1; + ts->abs_y_max = GOODIX_MAX_HEIGHT - 1; if (ts->swapped_x_y) swap(ts->abs_x_max, ts->abs_y_max); ts->int_trigger_type = GOODIX_INT_TRIGGER;@@ -596,8 +596,8 @@ static void goodix_read_config(structgoodix_ts_data *ts) return; } - ts->abs_x_max = get_unaligned_le16(&config[RESOLUTION_LOC]); - ts->abs_y_max = get_unaligned_le16(&config[RESOLUTION_LOC + 2]); + ts->abs_x_max = get_unaligned_le16(&config[RESOLUTION_LOC]) - 1; + ts->abs_y_max = get_unaligned_le16(&config[RESOLUTION_LOC + 2]) - 1; if (ts->swapped_x_y) swap(ts->abs_x_max, ts->abs_y_max); ts->int_trigger_type = config[TRIGGER_LOC] & 0x03;@@ -605,8 +605,8 @@ static void goodix_read_config(structgoodix_ts_data *ts) if (!ts->abs_x_max || !ts->abs_y_max || !ts->max_touch_num) { dev_err(&ts->client->dev, "Invalid config, using defaults\n"); - ts->abs_x_max = GOODIX_MAX_WIDTH; - ts->abs_y_max = GOODIX_MAX_HEIGHT; + ts->abs_x_max = GOODIX_MAX_WIDTH - 1; + ts->abs_y_max = GOODIX_MAX_HEIGHT - 1; if (ts->swapped_x_y) swap(ts->abs_x_max, ts->abs_y_max); ts->max_touch_num = GOODIX_MAX_CONTACTS;