On Monday, 13 March 2023 11:30:45 CET Nirmoy Das wrote:
> debug_active_activate() expected ref->count to be zero
> which is not true anymore as __i915_active_activate() calls
> debug_active_activate() after incrementing the count.
>
> v2: No need to check for "ref->count == 1" as __i915_active_activate()
> already make sure of that.
>
> Fixes: 04240e30ed06 ("drm/i915: Skip taking acquire mutex for no ref->active callback")
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> Cc: Thomas Hellström <thomas.hellstrom@xxxxxxxxx>
> Cc: Andi Shyti <andi.shyti@xxxxxxxxxxxxxxx>
> Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Janusz Krzysztofik <janusz.krzysztofik@xxxxxxxxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # v5.10+
> Signed-off-by: Nirmoy Das <nirmoy.das@xxxxxxxxx>
Reviewed-by: Janusz Krzysztofik <janusz.krzysztofik@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_active.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
> index a9fea115f2d2..8ef93889061a 100644
> --- a/drivers/gpu/drm/i915/i915_active.c
> +++ b/drivers/gpu/drm/i915/i915_active.c
> @@ -92,8 +92,7 @@ static void debug_active_init(struct i915_active *ref)
> static void debug_active_activate(struct i915_active *ref)
> {
> lockdep_assert_held(&ref->tree_lock);
> - if (!atomic_read(&ref->count)) /* before the first inc */
> - debug_object_activate(ref, &active_debug_desc);
> + debug_object_activate(ref, &active_debug_desc);
> }
>
> static void debug_active_deactivate(struct i915_active *ref)
>
