On Mon, Feb 2, 2026 at 3:22 AM Yifan Zhang <[email protected]> wrote: > > Ungate GPU CG/PG in device_fini_hw and device_halt to protect GPU > register accesses, e.g. GC registers are accessed in amdgpu_irq_disable_all() > and amdgpu_fence_driver_hw_fini(). > > Signed-off-by: Yifan Zhang <[email protected]> > Reviewed-by: Lijo Lazar <[email protected]>
Acked-by: Alex Deucher <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index e69ab8a923e3..095730c7ef8f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -3506,9 +3506,6 @@ static int amdgpu_device_ip_fini_early(struct > amdgpu_device *adev) > } > } > > - amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); > - amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); > - > amdgpu_amdkfd_suspend(adev, true); > amdgpu_amdkfd_teardown_processes(adev); > amdgpu_userq_suspend(adev); > @@ -4904,6 +4901,9 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) > amdgpu_virt_fini_data_exchange(adev); > } > > + amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); > + amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); > + > /* disable all interrupts */ > amdgpu_irq_disable_all(adev); > if (adev->mode_info.mode_config_initialized) { > @@ -7362,6 +7362,9 @@ void amdgpu_device_halt(struct amdgpu_device *adev) > amdgpu_xcp_dev_unplug(adev); > drm_dev_unplug(ddev); > > + amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); > + amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); > + > amdgpu_irq_disable_all(adev); > > amdgpu_fence_driver_hw_fini(adev); > -- > 2.43.0 >
