| Message ID | 20180125190829.8968-2-m.niestroj@grinn-global.com (mailing list archive) |
|---|---|
| State | Under Review |
| Headers | show |
On Thu, 2018-01-25 at 20:08 +0100, Marcin Niestroj wrote: > Touchscreen coordinates are 0-indexed, so report touchscreen range > as (0:size-1). > > Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> > Fixes: ca96ea86eed4 ("Input: add driver for the Goodix touchpanel") Reviewed-by: Bastien Nocera <hadess@hadess.net> > --- > Changes v2 -> v3: fix commit description (suggested by Bastien) > > 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.c > b/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(struct > goodix_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(struct > goodix_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(struct > goodix_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; -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/touchscreen/goodix.c b/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(struct goodix_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(struct goodix_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(struct goodix_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;
Touchscreen coordinates are 0-indexed, so report touchscreen range as (0:size-1). Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> Fixes: ca96ea86eed4 ("Input: add driver for the Goodix touchpanel") --- Changes v2 -> v3: fix commit description (suggested by Bastien) 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(-)