| Message ID | 1346528835-363-17-git-send-email-rydberg@euromail.se (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
On Sat, 1 Sep 2012, Henrik Rydberg wrote: > Going through the motions of printing the debug message information > takes a long time; using the keyboard can lead to a 160 us irqsoff > latency. This patch skips hid_dump_input() when there are no open > handles, which brings latency down to 100 us. > > Signed-off-by: Henrik Rydberg <rydberg@euromail.se> > --- > drivers/hid/hid-core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c > index 60ea284..5b74e78 100644 > --- a/drivers/hid/hid-core.c > +++ b/drivers/hid/hid-core.c > @@ -996,7 +996,8 @@ static void hid_process_event(struct hid_device *hid, struct hid_field *field, > struct hid_driver *hdrv = hid->driver; > int ret; > > - hid_dump_input(hid, usage, value); > + if (!list_empty(&hid->debug_list)) > + hid_dump_input(hid, usage, value); > > if (hdrv && hdrv->event && hid_match_usage(hid, usage)) { > ret = hdrv->event(hid, field, usage, value); Henrik, I have applied this one right away, so you can drop it from your series. The remaining ones I am still about to review (currently travelling). There is no inter-dependency between the Input and HID ones, and so we can handle them with Dmitry as two independent Input and HID series, right? Thanks a lot,
Hi Jiri, > I have applied this one right away, so you can drop it from your series. > The remaining ones I am still about to review (currently travelling). Great, thanks. The notification callback can also be applied if you want. > There is no inter-dependency between the Input and HID ones, and so we can > handle them with Dmitry as two independent Input and HID series, right? Not quite, I am afraid. Some of the overlap has disappeared, true. However, the hid-multitouch patches depend on new variables defined in the input-mt patches, which in turn depend on the input core changes. The hid-multitouch patches will apply (with a tiny merge conflict), but they will not compile. I can split the input-core and hid-core changes into separate sets, and those could be applied separately. The input-mt and bcm5974 will then build on input-core, and hid-multitouch will build on both input-core and hid-core. I am not sure if this helps anyone, though. Thanks, Henrik -- 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
On Sun, 2 Sep 2012, Henrik Rydberg wrote: > > I have applied this one right away, so you can drop it from your series. > > The remaining ones I am still about to review (currently travelling). > > Great, thanks. The notification callback can also be applied if you want. > > > There is no inter-dependency between the Input and HID ones, and so we can > > handle them with Dmitry as two independent Input and HID series, right? > > Not quite, I am afraid. Some of the overlap has disappeared, true. > However, the hid-multitouch patches depend on new variables defined in > the input-mt patches, which in turn depend on the input core > changes. The hid-multitouch patches will apply (with a tiny merge > conflict), but they will not compile. > > I can split the input-core and hid-core changes into separate sets, > and those could be applied separately. The input-mt and bcm5974 will > then build on input-core, and hid-multitouch will build on both > input-core and hid-core. I am not sure if this helps anyone, though. I don't think so. Let's wait once Dmitry is finished with the input changes, and I can either take the set through my tree with his Signed-off-by: on the Input patches, or vice-versa. Thanks,
On Thu, Sep 6, 2012 at 1:57 PM, Henrik Rydberg <rydberg@euromail.se> wrote: >> Let's wait once Dmitry is finished with the input changes, and I can >> either take the set through my tree with his Signed-off-by: on the Input >> patches, or vice-versa. > > Ok. Meanwhile, the current set is now in a temporary branch on github, > see below. Given there are no more change requests, I can add the > right SOBs and push it to my next tree for a while, before sending a > proper pull request to either of you. > > Thanks, > Henrik > > The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d: > > Linux 3.6-rc4 (2012-09-01 10:39:58 -0700) > > are available in the git repository at: > > git://github.com/rydberg/linux.git maybe This branch is tested with a Wacom Bamboo3 and an Intuos 5 M. Tested-by: Ping Cheng <pingc@wacom.com> Ping > for you to fetch changes up to 631ea780695fdc0d1efa91b6714bd85369daab06: > > HID: hid-multitouch: Add Flatfrog support (2012-09-06 22:21:02 +0200) > > ---------------------------------------------------------------- > Henrik Rydberg (21): > Input: Break out MT data > Input: Improve the events-per-packet estimate > Input: Make sure we follow all EV_KEY events > Input: Move autorepeat to the event-passing phase > Input: Send events one packet at a time > Input: evdev - Add the events() callback > Input: MT - Add flags to input_mt_init_slots() > Input: MT - Handle frame synchronization in core > Input: MT - Add in-kernel tracking > Input: MT - Get slot by key > Input: bcm5974 - only setup button urb for TYPE1 devices > Input: bcm5974 - Preparatory renames > Input: bcm5974 - Drop pressure and width emulation > Input: bcm5974 - Drop the logical dimensions > Input: bcm5974 - Convert to MT-B > HID: Add an input configured notification callback > HID: hid-multitouch: Simplify setup and frame synchronization > HID: hid-multitouch: Remove the redundant touch state > HID: hid-multitouch: Fix contact count on 3M panels > HID: Allow more fields in the hid report > HID: hid-multitouch: Add Flatfrog support > > drivers/hid/hid-ids.h | 3 + > drivers/hid/hid-input.c | 11 +- > drivers/hid/hid-magicmouse.c | 2 +- > drivers/hid/hid-multitouch.c | 192 +++++++++++++++----------------- > drivers/input/evdev.c | 78 ++++++++----- > drivers/input/input-mt.c | 294 +++++++++++++++++++++++++++++++++++++++++++++---- > drivers/input/input.c | 245 +++++++++++++++++++++++++++-------------- > drivers/input/misc/uinput.c | 2 +- > drivers/input/mouse/alps.c | 2 +- > drivers/input/mouse/bcm5974.c | 317 ++++++++++++++++++++--------------------------------- > drivers/input/mouse/elantech.c | 4 +- > drivers/input/mouse/sentelic.c | 2 +- > drivers/input/mouse/synaptics.c | 4 +- > drivers/input/tablet/wacom_wac.c | 6 +- > drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- > drivers/input/touchscreen/cyttsp_core.c | 2 +- > drivers/input/touchscreen/edt-ft5x06.c | 2 +- > drivers/input/touchscreen/egalax_ts.c | 2 +- > drivers/input/touchscreen/ili210x.c | 2 +- > drivers/input/touchscreen/mms114.c | 2 +- > drivers/input/touchscreen/penmount.c | 2 +- > drivers/input/touchscreen/wacom_w8001.c | 2 +- > include/linux/hid.h | 5 +- > include/linux/input.h | 33 ++++-- > include/linux/input/mt.h | 55 +++++++++- > 25 files changed, 807 insertions(+), 464 deletions(-) > -- > 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 -- 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
On Thu, 6 Sep 2012, Henrik Rydberg wrote: > > Let's wait once Dmitry is finished with the input changes, and I can > > either take the set through my tree with his Signed-off-by: on the Input > > patches, or vice-versa. > > Ok. Meanwhile, the current set is now in a temporary branch on github, > see below. Given there are no more change requests, I can add the > right SOBs and push it to my next tree for a while, before sending a > proper pull request to either of you. > > Thanks, > Henrik > > The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d: > > Linux 3.6-rc4 (2012-09-01 10:39:58 -0700) > > are available in the git repository at: > > git://github.com/rydberg/linux.git maybe > > for you to fetch changes up to 631ea780695fdc0d1efa91b6714bd85369daab06: > > HID: hid-multitouch: Add Flatfrog support (2012-09-06 22:21:02 +0200) > Dmitry, how do you want to handle this? I am fine with all the HID changes. So either I can take it through my tree and add your Sigoff to the Input patches (if you are fine with those), or vice versa (or take this through git branches, i.e. you apply the Input bits, I fetch that branch, and apply the rest on top of it). Thanks,
> Dmitry, > > how do you want to handle this? I am fine with all the HID changes. So > either I can take it through my tree and add your Sigoff to the Input > patches (if you are fine with those), or vice versa (or take this through > git branches, i.e. you apply the Input bits, I fetch that branch, and > apply the rest on top of it). I went ahead and pushed the (updated) branch to my for-next, to get some integration coverage. It is that time. Jiri, I added your Acked-by on the hid patches for now, hope that is alright. Thanks, Henrik -- 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
On Mon, 10 Sep 2012, Henrik Rydberg wrote: > > how do you want to handle this? I am fine with all the HID changes. So > > either I can take it through my tree and add your Sigoff to the Input > > patches (if you are fine with those), or vice versa (or take this through > > git branches, i.e. you apply the Input bits, I fetch that branch, and > > apply the rest on top of it). > > I went ahead and pushed the (updated) branch to my for-next, to get > some integration coverage. It is that time. Jiri, I added your > Acked-by on the hid patches for now, hope that is alright. Yes, it is, thanks Henrik. Dmitry, I can pull the whole lot into my tree once you Ack/Signoff the input patches, if you wish.
On Monday, September 10, 2012 10:49:13 PM Jiri Kosina wrote: > On Mon, 10 Sep 2012, Henrik Rydberg wrote: > > > how do you want to handle this? I am fine with all the HID changes. So > > > either I can take it through my tree and add your Sigoff to the Input > > > patches (if you are fine with those), or vice versa (or take this > > > through > > > git branches, i.e. you apply the Input bits, I fetch that branch, and > > > apply the rest on top of it). > > > > I went ahead and pushed the (updated) branch to my for-next, to get > > some integration coverage. It is that time. Jiri, I added your > > Acked-by on the hid patches for now, hope that is alright. > > Yes, it is, thanks Henrik. > > Dmitry, I can pull the whole lot into my tree once you Ack/Signoff the > input patches, if you wish. Yes, let me try to go through the patches tonight and I'll let yo know...
> > > I went ahead and pushed the (updated) branch to my for-next, to get > > > some integration coverage. It is that time. Jiri, I added your > > > Acked-by on the hid patches for now, hope that is alright. > > > > Yes, it is, thanks Henrik. > > > > Dmitry, I can pull the whole lot into my tree once you Ack/Signoff the > > input patches, if you wish. > > Yes, let me try to go through the patches tonight and I'll let yo know... Dmitry, given the oops-fix amended, are you ok with the input core changes at this point? If so, I can add your ACK on those, and refresh the input, input-mt and hid changes to next. I will be back with the reworked bcm5974 set, but the rest should be ready for a pull from Jiri. Thanks, Henrik -- 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/hid/hid-core.c b/drivers/hid/hid-core.c index 60ea284..5b74e78 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -996,7 +996,8 @@ static void hid_process_event(struct hid_device *hid, struct hid_field *field, struct hid_driver *hdrv = hid->driver; int ret; - hid_dump_input(hid, usage, value); + if (!list_empty(&hid->debug_list)) + hid_dump_input(hid, usage, value); if (hdrv && hdrv->event && hid_match_usage(hid, usage)) { ret = hdrv->event(hid, field, usage, value);
Going through the motions of printing the debug message information takes a long time; using the keyboard can lead to a 160 us irqsoff latency. This patch skips hid_dump_input() when there are no open handles, which brings latency down to 100 us. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> --- drivers/hid/hid-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)