[Intel-gfx] [PATCH v2] drm/i915/active: Fix missing debug object activation

[Andrzej Hajda]

On 13.03.2023 11:30, 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 at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Thomas Hellström <thomas.hellstrom at intel.com>
> Cc: Andi Shyti <andi.shyti at linux.intel.com>
> Cc: intel-gfx at lists.freedesktop.org
> Cc: Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com>
> Cc: <stable at vger.kernel.org> # v5.10+
> Signed-off-by: Nirmoy Das <nirmoy.das at intel.com>

Reviewed-by: Andrzej Hajda <andrzej.hajda at intel.com>

Regards
Andrzej
> ---
>   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)