From: Marcin Niestroj <m.niestroj@grinn-global.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Bastien Nocera <hadess@hadess.net>, Antonio Ospite <ao2@ao2.it>,
linux-input@vger.kernel.org,
Marcin Niestroj <m.niestroj@grinn-global.com>
Subject: [PATCH v2 1/3] Input: goodix - fix reported range
Date: Tue, 14 Nov 2017 13:42:15 +0100 [thread overview]
Message-ID: <20171114124217.2863-2-m.niestroj@grinn-global.com> (raw)
In-Reply-To: <20171114124217.2863-1-m.niestroj@grinn-global.com>
Touchscreen with x and y resolution should report (0:x-1), (0:y-1) as
it's range. Fix driver to do that.
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Fixes: ca96ea86eed4 ("Input: add driver for the Goodix touchpanel")
---
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;
--
2.15.0
next prev parent reply other threads:[~2017-11-14 12:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 12:42 [PATCH v2 0/3] Input: goodix - fixes and conversion to touchscreen_properties Marcin Niestroj
2017-11-14 12:42 ` Marcin Niestroj [this message]
2017-11-14 14:08 ` [PATCH v2 1/3] Input: goodix - fix reported range Bastien Nocera
2017-11-14 12:42 ` [PATCH v2 2/3] Input: goodix - fix simultaneous axes inversion and swap Marcin Niestroj
2017-11-14 14:17 ` Bastien Nocera
2017-11-14 12:42 ` [PATCH v2 3/3] Input: goodix - use generic touchscreen_properties Marcin Niestroj
2017-11-14 14:37 ` Bastien Nocera
2017-11-14 18:03 ` Dmitry Torokhov
2017-11-15 13:43 ` Bastien Nocera
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171114124217.2863-2-m.niestroj@grinn-global.com \
--to=m.niestroj@grinn-global.com \
--cc=ao2@ao2.it \
--cc=dmitry.torokhov@gmail.com \
--cc=hadess@hadess.net \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox