AMD General Please add a comment for the added condition check, then the patch is:
Reviewed-by: Tao Zhou <[email protected]> > -----Original Message----- > From: amd-gfx <[email protected]> On Behalf Of Ce Sun > Sent: Friday, November 13, 2026 11:28 AM > To: [email protected] > Cc: Zhang, Hawking <[email protected]>; Zhou1, Tao > <[email protected]>; Sun, Ce(Overlord) <[email protected]>; Chai, Thomas > <[email protected]> > Subject: [PATCH] drm/amdgpu: skip uniras block ECC query in GPU reset path > > amdgpu_uniras_query_block_ecc doesn't support being called during GPU reset. > > Signed-off-by: Ce Sun <[email protected]> > Signed-off-by: YiPeng Chai <[email protected]> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > index 08c6e55a7927..7be33d5559ab 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c > @@ -3770,6 +3770,10 @@ static int amdgpu_persistent_edc_harvesting(struct > amdgpu_device *adev, > if (!amdgpu_persistent_edc_harvesting_supported(adev)) > return 0; > > + if ((amdgpu_in_reset(adev) || amdgpu_ras_in_recovery(adev)) && > + amdgpu_uniras_enabled(adev)) > + return 0; > + > if (amdgpu_ras_query_error_status(adev, &info) != 0) > drm_warn(adev_to_drm(adev), "RAS init query failure"); > > -- > 2.34.1
