AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jiang Liu <gerry@linux.alibaba.com>
To: alexander.deucher@amd.com, christian.koenig@amd.com,
	Xinhui.Pan@amd.com, airlied@gmail.com, simona@ffwll.ch,
	sunil.khatri@amd.com, lijo.lazar@amd.com, Hawking.Zhang@amd.com,
	mario.limonciello@amd.com, xiaogang.chen@amd.com,
	Kent.Russell@amd.com, shuox.liu@linux.alibaba.com,
	amd-gfx@lists.freedesktop.org
Cc: Jiang Liu <gerry@linux.alibaba.com>
Subject: [RFC v2 04/15] drm/amdgpu: introduce a flag to track refcount held for features
Date: Mon, 13 Jan 2025 09:42:09 +0800	[thread overview]
Message-ID: <d8db52c680a7c549865dff8143320ebb2df28d64.1736732062.git.gerry@linux.alibaba.com> (raw)
In-Reply-To: <cover.1736732062.git.gerry@linux.alibaba.com>

Currently we track the refcount on ras block object for features by
checking `if (obj && amdgpu_ras_is_feature_enabled(adev, head))`,
which is a little unreliable. So introduce a dedicated flag to track
the reference count.

Signed-off-by: Jiang Liu <gerry@linux.alibaba.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h     | 1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 09b63a622728..24ef39b706e3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -380,6 +380,7 @@ int amdgpu_ip_block_resume(struct amdgpu_ip_block *ip_block);
 enum amdgpu_marker {
 	// Markers for ras blocks.
 	AMDGPU_MARKER_RAS_DEBUGFS,
+	AMDGPU_MARKER_RAS_FEATURE,
 	// Markers for IRQs, used for both ip blocks and ras blocks.
 	AMDGPU_MARKER_IRQ0 = 32,
 	AMDGPU_MARKER_IRQ1,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 6b508a9b1abe..f0cd14ff78a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -775,15 +775,20 @@ static int __amdgpu_ras_feature_enable(struct amdgpu_device *adev,
 			obj = amdgpu_ras_create_obj(adev, head);
 			if (!obj)
 				return -EINVAL;
-		} else {
+			amdgpu_ras_set_marker(adev, head, AMDGPU_MARKER_RAS_FEATURE);
+		} else if (!amdgpu_ras_test_marker(adev, head,
+						   AMDGPU_MARKER_RAS_FEATURE)) {
 			/* In case we create obj somewhere else */
 			get_obj(obj);
+			amdgpu_ras_set_marker(adev, head, AMDGPU_MARKER_RAS_FEATURE);
 		}
 		con->features |= BIT(head->block);
 	} else {
 		if (obj && amdgpu_ras_is_feature_enabled(adev, head)) {
 			con->features &= ~BIT(head->block);
-			put_obj(obj);
+			if (amdgpu_ras_test_and_clear_marker(adev, head,
+							     AMDGPU_MARKER_RAS_FEATURE))
+				put_obj(obj);
 		}
 	}
 
-- 
2.43.5


  parent reply	other threads:[~2025-01-13  1:42 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-13  1:42 [RFC v2 00/15] Enhance device state machine to better support suspend/resume Jiang Liu
2025-01-13  1:42 ` [RFC v2 01/15] drm/amdgpu: add helper functions to track status for ras manager Jiang Liu
2025-01-17  1:13   ` Wang, Yang(Kevin)
2025-01-17  5:03   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 02/15] drm/amdgpu: add a flag to track ras debugfs creation status Jiang Liu
2025-01-17  5:24   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 03/15] drm/amdgpu: free all resources on error recovery path of amdgpu_ras_init() Jiang Liu
2025-01-16 21:02   ` Mario Limonciello
2025-01-17  5:39   ` Lazar, Lijo
2025-01-13  1:42 ` Jiang Liu [this message]
2025-01-17  5:46   ` [RFC v2 04/15] drm/amdgpu: introduce a flag to track refcount held for features Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 05/15] drm/amdgpu: enhance amdgpu_ras_block_late_fini() Jiang Liu
2025-01-16 21:10   ` Mario Limonciello
2025-01-17  5:54   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 06/15] drm/amdgpu: enhance amdgpu_ras_pre_fini() to better support SR Jiang Liu
2025-01-16 21:19   ` Mario Limonciello
2025-01-17  6:09   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 07/15] drm/admgpu: rename amdgpu_ras_pre_fini() to amdgpu_ras_early_fini() Jiang Liu
2025-01-16 21:25   ` Mario Limonciello
2025-01-17  1:19   ` Wang, Yang(Kevin)
2025-01-17  8:37   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 08/15] drm/amdgpu: make IP block state machine works in stack like way Jiang Liu
2025-01-17  8:45   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 09/15] drm/amdgpu_dm: enhance amdgpu_dm_early_fini() for PM ops Jiang Liu
2025-01-16 21:30   ` Mario Limonciello
2025-01-13  1:42 ` [RFC v2 10/15] drm/admgpu: make device state machine work in stack like way Jiang Liu
2025-01-13 22:27   ` Mario Limonciello
2025-01-14  1:58     ` Gerry Liu
2025-01-15 19:36       ` Mario Limonciello
2025-01-17  8:54   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 11/15] drm/amdgpu: convert ip block bool flags into an enum Jiang Liu
2025-01-17  8:57   ` Lazar, Lijo
2025-01-13  1:42 ` [RFC v2 12/15] drm/amdgpu: introduce IP block iterators to reduce duplicated code Jiang Liu
2025-01-13  1:42 ` [RFC v2 13/15] drm/amdgpu: walk IP blocks in reverse order when shutdown Jiang Liu
2025-01-13 22:28   ` Mario Limonciello
2025-01-13  1:42 ` [RFC v2 14/15] drm/amdgpu/nbio: improve the way to manage irq reference count Jiang Liu
2025-01-13  1:42 ` [RFC v2 15/15] drm/amdgpu/asic: make ip block operations symmetric by .early_fini() Jiang Liu
2025-01-20  6:27 ` [RFC v2 00/15] Enhance device state machine to better support suspend/resume Zhang, Hawking
2025-01-23  0:02   ` Mika Laitio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d8db52c680a7c549865dff8143320ebb2df28d64.1736732062.git.gerry@linux.alibaba.com \
    --to=gerry@linux.alibaba.com \
    --cc=Hawking.Zhang@amd.com \
    --cc=Kent.Russell@amd.com \
    --cc=Xinhui.Pan@amd.com \
    --cc=airlied@gmail.com \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=christian.koenig@amd.com \
    --cc=lijo.lazar@amd.com \
    --cc=mario.limonciello@amd.com \
    --cc=shuox.liu@linux.alibaba.com \
    --cc=simona@ffwll.ch \
    --cc=sunil.khatri@amd.com \
    --cc=xiaogang.chen@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox