* [PATCH] Revert "drm/amdgpu: Update irq disable flow during unload"
@ 2024-01-08 10:57 Asad Kamal
2024-01-08 11:09 ` Lazar, Lijo
0 siblings, 1 reply; 2+ messages in thread
From: Asad Kamal @ 2024-01-08 10:57 UTC (permalink / raw)
To: amd-gfx, lijo.lazar, hawking.zhang
Cc: le.ma, asad.kamal, shiwu.zhang, ckoenig.leichtzumerken
Re-evaluate the original workaround: commit f5c7e7797060 ("drm/amdgpu:
Adjust removal control flow for smu v13_0_2")
This reverts commit 2e8e792e6a51e8cb7f5f96148146b6525dbb9cef.
Signed-off-by: Asad Kamal <asad.kamal@amd.com>
---
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 ++----------
drivers/gpu/drm/amd/amdgpu/soc15.c | 13 ++-----------
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index c8a3ef71d6ad..f9039d64ff2d 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -2361,7 +2361,6 @@ static void gmc_v9_0_gart_disable(struct amdgpu_device *adev)
static int gmc_v9_0_hw_fini(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
- bool irq_release = true;
gmc_v9_0_gart_disable(adev);
@@ -2379,16 +2378,9 @@ static int gmc_v9_0_hw_fini(void *handle)
if (adev->mmhub.funcs->update_power_gating)
adev->mmhub.funcs->update_power_gating(adev, false);
- if (adev->shutdown)
- irq_release = amdgpu_irq_enabled(adev, &adev->gmc.vm_fault, 0);
+ amdgpu_irq_put(adev, &adev->gmc.vm_fault, 0);
- if (irq_release)
- amdgpu_irq_put(adev, &adev->gmc.vm_fault, 0);
-
- if (adev->shutdown)
- irq_release = amdgpu_irq_enabled(adev, &adev->gmc.ecc_irq, 0);
-
- if (adev->gmc.ecc_irq.funcs && irq_release &&
+ if (adev->gmc.ecc_irq.funcs &&
amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC))
amdgpu_irq_put(adev, &adev->gmc.ecc_irq, 0);
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 7ee835049d57..15033efec2ba 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -1266,7 +1266,6 @@ static int soc15_common_hw_init(void *handle)
static int soc15_common_hw_fini(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
- bool irq_release = true;
/* Disable the doorbell aperture and selfring doorbell aperture
* separately in hw_fini because soc15_enable_doorbell_aperture
@@ -1281,18 +1280,10 @@ static int soc15_common_hw_fini(void *handle)
if (adev->nbio.ras_if &&
amdgpu_ras_is_supported(adev, adev->nbio.ras_if->block)) {
- if (adev->shutdown)
- irq_release = amdgpu_irq_enabled(adev, &adev->nbio.ras_controller_irq, 0);
-
- if (adev->nbio.ras && irq_release &&
+ if (adev->nbio.ras &&
adev->nbio.ras->init_ras_controller_interrupt)
amdgpu_irq_put(adev, &adev->nbio.ras_controller_irq, 0);
-
- if (adev->shutdown)
- irq_release = amdgpu_irq_enabled(adev,
- &adev->nbio.ras_err_event_athub_irq, 0);
-
- if (adev->nbio.ras && irq_release &&
+ if (adev->nbio.ras &&
adev->nbio.ras->init_ras_err_event_athub_interrupt)
amdgpu_irq_put(adev, &adev->nbio.ras_err_event_athub_irq, 0);
}
--
2.42.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Revert "drm/amdgpu: Update irq disable flow during unload"
2024-01-08 10:57 [PATCH] Revert "drm/amdgpu: Update irq disable flow during unload" Asad Kamal
@ 2024-01-08 11:09 ` Lazar, Lijo
0 siblings, 0 replies; 2+ messages in thread
From: Lazar, Lijo @ 2024-01-08 11:09 UTC (permalink / raw)
To: Asad Kamal, amd-gfx, hawking.zhang
Cc: le.ma, shiwu.zhang, ckoenig.leichtzumerken
On 1/8/2024 4:27 PM, Asad Kamal wrote:
> Re-evaluate the original workaround: commit f5c7e7797060 ("drm/amdgpu:
> Adjust removal control flow for smu v13_0_2")
>
> This reverts commit 2e8e792e6a51e8cb7f5f96148146b6525dbb9cef.
>
> Signed-off-by: Asad Kamal <asad.kamal@amd.com>
You may reword the commmit message as 'revert the commit and re-evaluate
the original workaround'
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Thanks,
Lijo
> ---
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 ++----------
> drivers/gpu/drm/amd/amdgpu/soc15.c | 13 ++-----------
> 2 files changed, 4 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index c8a3ef71d6ad..f9039d64ff2d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -2361,7 +2361,6 @@ static void gmc_v9_0_gart_disable(struct amdgpu_device *adev)
> static int gmc_v9_0_hw_fini(void *handle)
> {
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> - bool irq_release = true;
>
> gmc_v9_0_gart_disable(adev);
>
> @@ -2379,16 +2378,9 @@ static int gmc_v9_0_hw_fini(void *handle)
> if (adev->mmhub.funcs->update_power_gating)
> adev->mmhub.funcs->update_power_gating(adev, false);
>
> - if (adev->shutdown)
> - irq_release = amdgpu_irq_enabled(adev, &adev->gmc.vm_fault, 0);
> + amdgpu_irq_put(adev, &adev->gmc.vm_fault, 0);
>
> - if (irq_release)
> - amdgpu_irq_put(adev, &adev->gmc.vm_fault, 0);
> -
> - if (adev->shutdown)
> - irq_release = amdgpu_irq_enabled(adev, &adev->gmc.ecc_irq, 0);
> -
> - if (adev->gmc.ecc_irq.funcs && irq_release &&
> + if (adev->gmc.ecc_irq.funcs &&
> amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC))
> amdgpu_irq_put(adev, &adev->gmc.ecc_irq, 0);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 7ee835049d57..15033efec2ba 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -1266,7 +1266,6 @@ static int soc15_common_hw_init(void *handle)
> static int soc15_common_hw_fini(void *handle)
> {
> struct amdgpu_device *adev = (struct amdgpu_device *)handle;
> - bool irq_release = true;
>
> /* Disable the doorbell aperture and selfring doorbell aperture
> * separately in hw_fini because soc15_enable_doorbell_aperture
> @@ -1281,18 +1280,10 @@ static int soc15_common_hw_fini(void *handle)
>
> if (adev->nbio.ras_if &&
> amdgpu_ras_is_supported(adev, adev->nbio.ras_if->block)) {
> - if (adev->shutdown)
> - irq_release = amdgpu_irq_enabled(adev, &adev->nbio.ras_controller_irq, 0);
> -
> - if (adev->nbio.ras && irq_release &&
> + if (adev->nbio.ras &&
> adev->nbio.ras->init_ras_controller_interrupt)
> amdgpu_irq_put(adev, &adev->nbio.ras_controller_irq, 0);
> -
> - if (adev->shutdown)
> - irq_release = amdgpu_irq_enabled(adev,
> - &adev->nbio.ras_err_event_athub_irq, 0);
> -
> - if (adev->nbio.ras && irq_release &&
> + if (adev->nbio.ras &&
> adev->nbio.ras->init_ras_err_event_athub_interrupt)
> amdgpu_irq_put(adev, &adev->nbio.ras_err_event_athub_irq, 0);
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-08 11:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-08 10:57 [PATCH] Revert "drm/amdgpu: Update irq disable flow during unload" Asad Kamal
2024-01-08 11:09 ` Lazar, Lijo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox