From: "Lazar, Lijo" <lijo.lazar@amd.com>
To: Jiang Liu <gerry@linux.alibaba.com>,
alexander.deucher@amd.com, christian.koenig@amd.com,
Xinhui.Pan@amd.com, airlied@gmail.com, simona@ffwll.ch,
sunil.khatri@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
Subject: Re: [RFC v2 07/15] drm/admgpu: rename amdgpu_ras_pre_fini() to amdgpu_ras_early_fini()
Date: Fri, 17 Jan 2025 14:07:00 +0530 [thread overview]
Message-ID: <ed1bf88c-aac6-44de-8dbd-78cc205e4374@amd.com> (raw)
In-Reply-To: <0e66fc11d40fc0f9c8ea4e2bd3ac70b7b8933ee5.1736732062.git.gerry@linux.alibaba.com>
On 1/13/2025 7:12 AM, Jiang Liu wrote:
> Rename amdgpu_ras_pre_fini() to amdgpu_ras_early_fini(), to keep same
> style with other code.
>
> Signed-off-by: Jiang Liu <gerry@linux.alibaba.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 16 ++++++++--------
> drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 +++---
> drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 2 +-
> 14 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 2bfe113e17c7..6cbd19ad0fa5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -4613,7 +4613,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
> return 0;
>
> release_ras_con:
> - amdgpu_ras_pre_fini(adev);
> + amdgpu_ras_early_fini(adev);
> amdgpu_ras_fini(adev);
> if (amdgpu_sriov_vf(adev))
> amdgpu_virt_release_full_gpu(adev, true);
> @@ -4705,7 +4705,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev)
> amdgpu_xcp_cfg_sysfs_fini(adev);
>
> /* disable ras feature must before hw fini */
> - amdgpu_ras_pre_fini(adev);
> + amdgpu_ras_early_fini(adev);
>
> amdgpu_ttm_set_buffer_funcs_status(adev, false);
>
> @@ -4922,7 +4922,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients)
> cancel_delayed_work_sync(&adev->delayed_init_work);
>
> /* disable ras feature must before hw fini */
> - amdgpu_ras_pre_fini(adev);
> + amdgpu_ras_early_fini(adev);
> amdgpu_ras_suspend(adev);
>
> amdgpu_device_ip_suspend_phase1(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> index 6d5d81f0dc4e..2e7c09530ec1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> @@ -918,7 +918,7 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
>
> return 0;
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> index b6d2eb049f54..80248930082c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> @@ -300,7 +300,7 @@ int amdgpu_jpeg_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
This feels confusing - calling early_fini from late_init
Thanks,
Lijo
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
> index d085687a47ea..c75ce91f94ab 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
> @@ -71,6 +71,6 @@ int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *
>
> return 0;
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index 5ac63f9cffda..b11e3eb2b100 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -4124,7 +4124,7 @@ int amdgpu_ras_block_late_init(struct amdgpu_device *adev,
> return 0;
>
> cleanup:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
> return r;
> }
>
> @@ -4135,7 +4135,7 @@ static int amdgpu_ras_block_late_init_default(struct amdgpu_device *adev,
> }
>
> /* helper function to remove ras fs node and interrupt handler */
> -void amdgpu_ras_block_late_fini(struct amdgpu_device *adev,
> +void amdgpu_ras_block_early_fini(struct amdgpu_device *adev,
> struct ras_common_if *ras_block)
> {
> struct amdgpu_ras_block_object *ras_obj;
> @@ -4156,10 +4156,10 @@ void amdgpu_ras_block_late_fini(struct amdgpu_device *adev,
> amdgpu_ras_interrupt_remove_handler(adev, ras_block);
> }
>
> -static void amdgpu_ras_block_late_fini_default(struct amdgpu_device *adev,
> +static void amdgpu_ras_block_early_fini_default(struct amdgpu_device *adev,
> struct ras_common_if *ras_block)
> {
> - return amdgpu_ras_block_late_fini(adev, ras_block);
> + return amdgpu_ras_block_early_fini(adev, ras_block);
> }
>
> /* do some init work after IP late init as dependence.
> @@ -4267,7 +4267,7 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev)
> }
>
> /* do some fini work before IP fini as dependence */
> -int amdgpu_ras_pre_fini(struct amdgpu_device *adev)
> +int amdgpu_ras_early_fini(struct amdgpu_device *adev)
> {
> struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
> struct amdgpu_ras_block_list *node, *tmp;
> @@ -4284,10 +4284,10 @@ int amdgpu_ras_pre_fini(struct amdgpu_device *adev)
> if (!amdgpu_ras_is_supported(adev, obj->ras_comm.block))
> continue;
>
> - if (obj->ras_fini)
> - obj->ras_fini(adev, &obj->ras_comm);
> + if (obj->ras_early_fini)
> + obj->ras_early_fini(adev, &obj->ras_comm);
> else
> - amdgpu_ras_block_late_fini_default(adev, &obj->ras_comm);
> + amdgpu_ras_block_early_fini_default(adev, &obj->ras_comm);
> }
>
> disable:
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> index 35881087b17b..3a6f70b75e47 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
> @@ -711,7 +711,7 @@ struct amdgpu_ras_block_object {
> int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj,
> enum amdgpu_ras_block block, uint32_t sub_block_index);
> int (*ras_late_init)(struct amdgpu_device *adev, struct ras_common_if *ras_block);
> - void (*ras_fini)(struct amdgpu_device *adev, struct ras_common_if *ras_block);
> + void (*ras_early_fini)(struct amdgpu_device *adev, struct ras_common_if *ras_block);
> ras_ih_cb ras_cb;
> const struct amdgpu_ras_block_hw_ops *hw_ops;
> };
> @@ -825,13 +825,13 @@ amdgpu_ras_error_to_ta(enum amdgpu_ras_error_type error) {
> /* called in ip_init and ip_fini */
> int amdgpu_ras_init(struct amdgpu_device *adev);
> int amdgpu_ras_late_init(struct amdgpu_device *adev);
> +int amdgpu_ras_early_fini(struct amdgpu_device *adev);
> int amdgpu_ras_fini(struct amdgpu_device *adev);
> -int amdgpu_ras_pre_fini(struct amdgpu_device *adev);
>
> int amdgpu_ras_block_late_init(struct amdgpu_device *adev,
> struct ras_common_if *ras_block);
>
> -void amdgpu_ras_block_late_fini(struct amdgpu_device *adev,
> +void amdgpu_ras_block_early_fini(struct amdgpu_device *adev,
> struct ras_common_if *ras_block);
>
> int amdgpu_ras_feature_enable(struct amdgpu_device *adev,
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
> index 174badca27e7..1a1834e47b50 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
> @@ -116,7 +116,7 @@ int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev,
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
> index eafe20d8fe0b..dd787f5f2f23 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
> @@ -336,7 +336,7 @@ int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 83faf6e6788a..3ab80399d2ba 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -1248,7 +1248,7 @@ int amdgpu_vcn_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
> return r;
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> index 74b4349e345a..825c331f48f0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> @@ -1174,7 +1174,7 @@ static int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev, struct ras_comm
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
>
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> index 2ba185875baa..ce70acfbf22c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
> @@ -5080,7 +5080,7 @@ static int gfx_v9_4_3_ras_late_init(struct amdgpu_device *adev, struct ras_commo
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
>
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
> index 88f9771c1686..28bc2f946e91 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
> @@ -1311,7 +1311,7 @@ static int jpeg_v4_0_3_ras_late_init(struct amdgpu_device *adev, struct ras_comm
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
>
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
> index e646e5cef0a2..467283165a3a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c
> @@ -789,7 +789,7 @@ static int mmhub_v1_8_ras_late_init(struct amdgpu_device *adev, struct ras_commo
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
>
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> index ecdc027f8220..063b3bafd134 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> @@ -1996,7 +1996,7 @@ static int vcn_v4_0_3_ras_late_init(struct amdgpu_device *adev, struct ras_commo
> return 0;
>
> late_fini:
> - amdgpu_ras_block_late_fini(adev, ras_block);
> + amdgpu_ras_block_early_fini(adev, ras_block);
>
> return r;
> }
next prev parent reply other threads:[~2025-01-17 8:37 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 ` [RFC v2 04/15] drm/amdgpu: introduce a flag to track refcount held for features Jiang Liu
2025-01-17 5:46 ` 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 [this message]
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=ed1bf88c-aac6-44de-8dbd-78cc205e4374@amd.com \
--to=lijo.lazar@amd.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=gerry@linux.alibaba.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