drm/i915/active: Fix missing debug object activation

nirmoy · jnikula · commit e92eb246feb9 · 2023-03-20T11:00:22.000+02:00
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 <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Thomas Hellström <thomas.hellstrom@intel.com> Cc: Andi Shyti <andi.shyti@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org Cc: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> Cc: <stable@vger.kernel.org> # v5.10+ Signed-off-by: Nirmoy Das <nirmoy.das@intel.com> Reviewed-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230313114613.9874-1-nirmoy.das@intel.com (cherry picked from commit bfad380) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ static void debug_active_init(struct i915_active *ref)`
`92`	`92`	`static void debug_active_activate(struct i915_active *ref)`
`93`	`93`	`{`
`94`	`94`	`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);`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`static void debug_active_deactivate(struct i915_active *ref)`