Skip to content

Commit e92eb24

Browse files
nirmoyjnikula
authored andcommitted
drm/i915/active: Fix missing debug object activation
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(Janusz). References: https://gitlab.freedesktop.org/drm/intel/-/issues/6733 Fixes: 04240e3 ("drm/i915: Skip taking acquire mutex for no ref->active callback") Cc: Chris Wilson <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Cc: Thomas Hellström <[email protected]> Cc: Andi Shyti <[email protected]> Cc: [email protected] Cc: Janusz Krzysztofik <[email protected]> Cc: <[email protected]> # v5.10+ Signed-off-by: Nirmoy Das <[email protected]> Reviewed-by: Janusz Krzysztofik <[email protected]> Reviewed-by: Andrzej Hajda <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit bfad380) Signed-off-by: Jani Nikula <[email protected]>
1 parent 8df23e4 commit e92eb24

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/i915/i915_active.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ static void debug_active_init(struct i915_active *ref)
9292
static void debug_active_activate(struct i915_active *ref)
9393
{
9494
lockdep_assert_held(&ref->tree_lock);
95-
if (!atomic_read(&ref->count)) /* before the first inc */
96-
debug_object_activate(ref, &active_debug_desc);
95+
debug_object_activate(ref, &active_debug_desc);
9796
}
9897

9998
static void debug_active_deactivate(struct i915_active *ref)

0 commit comments

Comments
 (0)