diff mbox

input: ff-memless: don't schedule already playing effect to play again

Message ID 1393760143-5986-1-git-send-email-felix.rueegg@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Felix Rueegg March 2, 2014, 11:35 a.m. UTC
When an effect with zero replay length, zero replay delay
and zero envelope attack length is uploaded, it is played and then scheduled to play
again one timer tick later. This triggers a warning (URB submitted while
active) in combination with the xpad driver.

Skipping the rescheduling of this effect fixes the issue.

Signed-off-by: Felix Rueegg <felix.rueegg@gmail.com>
---
 drivers/input/ff-memless.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Elias Vanderstuyft March 2, 2014, 1:17 p.m. UTC | #1
On Sun, Mar 2, 2014 at 12:35 PM, Felix Rueegg <felix.rueegg@gmail.com> wrote:
> When an effect with zero replay length, zero replay delay
> and zero envelope attack length is uploaded, it is played and then scheduled to play
> again one timer tick later. This triggers a warning (URB submitted while
> active) in combination with the xpad driver.
>
> Skipping the rescheduling of this effect fixes the issue.
>
> Signed-off-by: Felix Rueegg <felix.rueegg@gmail.com>
> ---
>  drivers/input/ff-memless.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
> index 74c0d8c..2e06948 100644
> --- a/drivers/input/ff-memless.c
> +++ b/drivers/input/ff-memless.c
> @@ -139,10 +139,13 @@ static void ml_schedule_timer(struct ml_device *ml)
>                 if (!test_bit(FF_EFFECT_STARTED, &state->flags))
>                         continue;
>
> -               if (test_bit(FF_EFFECT_PLAYING, &state->flags))
> +               if (test_bit(FF_EFFECT_PLAYING, &state->flags)) {
>                         next_at = calculate_next_time(state);
> -               else
> +                       if (next_at == now)
> +                               continue;
> +               } else {
>                         next_at = state->play_at;
> +               }
>
>                 if (time_before_eq(now, next_at) &&
>                     (++events == 1 || time_before(next_at, earliest)))
> --
> 1.9.0
>
> --

@Michal: Is ff-memless-next also affected by this problem?

Elias
--
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
Elias Vanderstuyft March 2, 2014, 1:36 p.m. UTC | #2
---------- Forwarded message ----------
From: Michal Malý <madcatxster@prifuk.cz>
Date: Sun, Mar 2, 2014 at 2:29 PM
Subject: Re: [PATCH] input: ff-memless: don't schedule already playing
effect to play again
To: Elias Vanderstuyft <elias.vds@gmail.com>


On Sunday 02 of March 2014 14:17:58 you wrote:
> On Sun, Mar 2, 2014 at 12:35 PM, Felix Rueegg
<felix.rueegg@gmail.com> wrote:
> > When an effect with zero replay length, zero replay delay
> > and zero envelope attack length is uploaded, it is played and then
> > scheduled to play again one timer tick later. This triggers a
warning
> > (URB submitted while active) in combination with the xpad driver.
> >
> > Skipping the rescheduling of this effect fixes the issue.
> >
> > Signed-off-by: Felix Rueegg <felix.rueegg@gmail.com>
> > ---
> >
> >  drivers/input/ff-memless.c | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
> > index 74c0d8c..2e06948 100644
> > --- a/drivers/input/ff-memless.c
> > +++ b/drivers/input/ff-memless.c
> > @@ -139,10 +139,13 @@ static void ml_schedule_timer(struct
ml_device *ml)
> >
> >                 if (!test_bit(FF_EFFECT_STARTED, &state->flags))
> >
> >                         continue;
> >
> > -               if (test_bit(FF_EFFECT_PLAYING, &state->flags))
> > +               if (test_bit(FF_EFFECT_PLAYING, &state->flags)) {
> >
> >                         next_at = calculate_next_time(state);
> >
> > -               else
> > +                       if (next_at == now)
> > +                               continue;
> > +               } else {
> >
> >                         next_at = state->play_at;
> >
> > +               }
> >
> >                 if (time_before_eq(now, next_at) &&
> >
> >                     (++events == 1 || time_before(next_at, earliest)))
> >
> > --
> > 1.9.0
> >
> > --
>
> @Michal: Is ff-memless-next also affected by this problem?
>
> Elias

I hope it's not, see mlnx_get_envelope_update_time(), this part in
particular:

        /* Prevent the effect from being started twice */
        if (mlnxeff->begin_at == now && mlnx_is_playing(mlnxeff))
                return now - 1;

        return mlnxeff->begin_at;

Michal
--
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
Michal Malý March 2, 2014, 1:37 p.m. UTC | #3
On Sunday 02 of March 2014 14:17:58 you wrote:
> On Sun, Mar 2, 2014 at 12:35 PM, Felix Rueegg 
<felix.rueegg@gmail.com> wrote:
> > When an effect with zero replay length, zero replay delay
> > and zero envelope attack length is uploaded, it is played and then
> > scheduled to play again one timer tick later. This triggers a 
warning
> > (URB submitted while active) in combination with the xpad driver.
> > 
> > Skipping the rescheduling of this effect fixes the issue.
> > 
> > Signed-off-by: Felix Rueegg <felix.rueegg@gmail.com>
> > ---
> > 
> >  drivers/input/ff-memless.c | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
> > index 74c0d8c..2e06948 100644
> > --- a/drivers/input/ff-memless.c
> > +++ b/drivers/input/ff-memless.c
> > @@ -139,10 +139,13 @@ static void ml_schedule_timer(struct 
ml_device *ml)
> > 
> >                 if (!test_bit(FF_EFFECT_STARTED, &state->flags))
> >                 
> >                         continue;
> > 
> > -               if (test_bit(FF_EFFECT_PLAYING, &state->flags))
> > +               if (test_bit(FF_EFFECT_PLAYING, &state->flags)) {
> > 
> >                         next_at = calculate_next_time(state);
> > 
> > -               else
> > +                       if (next_at == now)
> > +                               continue;
> > +               } else {
> > 
> >                         next_at = state->play_at;
> > 
> > +               }
> > 
> >                 if (time_before_eq(now, next_at) &&
> >                 
> >                     (++events == 1 || time_before(next_at, earliest)))
> > 
> > --
> > 1.9.0
> > 
> > --
> 
> @Michal: Is ff-memless-next also affected by this problem?
> 
> Elias

I hope it's not, see mlnx_get_envelope_update_time(), this part in 
particular:

        /* Prevent the effect from being started twice */
        if (mlnxeff->begin_at == now && mlnx_is_playing(mlnxeff))
                return now - 1;

        return mlnxeff->begin_at;

Michal
--
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
Dmitry Torokhov March 4, 2014, 5:07 p.m. UTC | #4
Hi Felix,

On Sun, Mar 02, 2014 at 12:35:43PM +0100, Felix Rueegg wrote:
> When an effect with zero replay length, zero replay delay
> and zero envelope attack length is uploaded, it is played and then scheduled to play
> again one timer tick later. This triggers a warning (URB submitted while
> active) in combination with the xpad driver.
> 
> Skipping the rescheduling of this effect fixes the issue.

Won't the same issue happen if we happen to schedule a different effect
that would start at "now" time? We should not be "dropping" the new
effect, at least not in core.

It looks to me xpad.c needs [more] love.

> 
> Signed-off-by: Felix Rueegg <felix.rueegg@gmail.com>
> ---
>  drivers/input/ff-memless.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
> index 74c0d8c..2e06948 100644
> --- a/drivers/input/ff-memless.c
> +++ b/drivers/input/ff-memless.c
> @@ -139,10 +139,13 @@ static void ml_schedule_timer(struct ml_device *ml)
>  		if (!test_bit(FF_EFFECT_STARTED, &state->flags))
>  			continue;
>  
> -		if (test_bit(FF_EFFECT_PLAYING, &state->flags))
> +		if (test_bit(FF_EFFECT_PLAYING, &state->flags)) {
>  			next_at = calculate_next_time(state);
> -		else
> +			if (next_at == now)
> +				continue;
> +		} else {
>  			next_at = state->play_at;
> +		}
>  
>  		if (time_before_eq(now, next_at) &&
>  		    (++events == 1 || time_before(next_at, earliest)))
> -- 
> 1.9.0
> 

Thanks.
Felix Rueegg March 6, 2014, 6:05 p.m. UTC | #5
Hi Dmitry,

On 03/04/2014 06:07 PM, Dmitry Torokhov wrote:
> Hi Felix,
>
> On Sun, Mar 02, 2014 at 12:35:43PM +0100, Felix Rueegg wrote:
>> When an effect with zero replay length, zero replay delay
>> and zero envelope attack length is uploaded, it is played and then scheduled to play
>> again one timer tick later. This triggers a warning (URB submitted while
>> active) in combination with the xpad driver.
>>
>> Skipping the rescheduling of this effect fixes the issue.
> Won't the same issue happen if we happen to schedule a different effect
> that would start at "now" time? We should not be "dropping" the new
> effect, at least not in core.
I can confirm this. It also happens sometimes with an effect that has a 
length and a replay count greater than one at the time, when the effect 
ends and restarts again.
> It looks to me xpad.c needs [more] love.
I agree and will try to come up with a fix for the xpad driver.

>> Signed-off-by: Felix Rueegg <felix.rueegg@gmail.com>
>> ---
>>   drivers/input/ff-memless.c | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
>> index 74c0d8c..2e06948 100644
>> --- a/drivers/input/ff-memless.c
>> +++ b/drivers/input/ff-memless.c
>> @@ -139,10 +139,13 @@ static void ml_schedule_timer(struct ml_device *ml)
>>   		if (!test_bit(FF_EFFECT_STARTED, &state->flags))
>>   			continue;
>>   
>> -		if (test_bit(FF_EFFECT_PLAYING, &state->flags))
>> +		if (test_bit(FF_EFFECT_PLAYING, &state->flags)) {
>>   			next_at = calculate_next_time(state);
>> -		else
>> +			if (next_at == now)
>> +				continue;
>> +		} else {
>>   			next_at = state->play_at;
>> +		}
>>   
>>   		if (time_before_eq(now, next_at) &&
>>   		    (++events == 1 || time_before(next_at, earliest)))
>> -- 
>> 1.9.0
>>
> Thanks.
>

--
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 mbox

Patch

diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index 74c0d8c..2e06948 100644
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -139,10 +139,13 @@  static void ml_schedule_timer(struct ml_device *ml)
 		if (!test_bit(FF_EFFECT_STARTED, &state->flags))
 			continue;
 
-		if (test_bit(FF_EFFECT_PLAYING, &state->flags))
+		if (test_bit(FF_EFFECT_PLAYING, &state->flags)) {
 			next_at = calculate_next_time(state);
-		else
+			if (next_at == now)
+				continue;
+		} else {
 			next_at = state->play_at;
+		}
 
 		if (time_before_eq(now, next_at) &&
 		    (++events == 1 || time_before(next_at, earliest)))