intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH v2] drm/i915/active: Fix missing debug object activation
@ 2023-03-13 10:30 Nirmoy Das
  2023-03-13 10:35 ` Janusz Krzysztofik
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: Nirmoy Das @ 2023-03-13 10:30 UTC (permalink / raw)
  To: intel-gfx; +Cc: stable, Chris Wilson, Thomas Hellström, Nirmoy Das

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@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>
---
 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)
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/active: Fix missing debug object activation
@ 2023-03-10 14:11 Nirmoy Das
  2023-03-10 15:19 ` Janusz Krzysztofik
  0 siblings, 1 reply; 11+ messages in thread
From: Nirmoy Das @ 2023-03-10 14:11 UTC (permalink / raw)
  To: intel-gfx; +Cc: stable, Chris Wilson, Thomas Hellström, Nirmoy Das

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.

Fixes: 04240e30ed06 ("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: <stable@vger.kernel.org> # v5.10+
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/i915/i915_active.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index a9fea115f2d2..1c3066eb359a 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -92,7 +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 */
+	if (atomic_read(&ref->count) == 1) /* after the first inc */
 		debug_object_activate(ref, &active_debug_desc);
 }
 
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-03-14 14:43 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-13 10:30 [Intel-gfx] [PATCH v2] drm/i915/active: Fix missing debug object activation Nirmoy Das
2023-03-13 10:35 ` Janusz Krzysztofik
2023-03-13 11:46 ` [Intel-gfx] [PATCH] " Nirmoy Das
2023-03-13 13:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/active: Fix missing debug object activation (rev3) Patchwork
2023-03-13 17:53 ` [Intel-gfx] [PATCH v2] drm/i915/active: Fix missing debug object activation Andrzej Hajda
2023-03-14 14:43 ` [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/active: Fix missing debug object activation (rev3) Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2023-03-10 14:11 [Intel-gfx] [PATCH] drm/i915/active: Fix missing debug object activation Nirmoy Das
2023-03-10 15:19 ` Janusz Krzysztofik
2023-03-10 16:48   ` Das, Nirmoy
2023-03-13  9:55     ` Janusz Krzysztofik
2023-03-13 10:33       ` Das, Nirmoy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).