On Wed, Jun 1, 2022 at 2:01 PM Alex Deucher <alexdeucher@xxxxxxxxx> wrote:
>
> On Wed, Jun 1, 2022 at 1:57 PM Candice Li <candice.li@xxxxxxx> wrote:
> >
> > Fix misleading indentation and add ras unsupported checking
> > for gfx ras late init.
> >
> > Signed-off-by: Candice Li <candice.li@xxxxxxx>
>
> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
Also, if this was a recent change, a Fixes: tag would be nice.
Alex
>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> > index 99c1a2d3dae84d..16699158e00d8c 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
> > @@ -599,13 +599,15 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r
> > if (!amdgpu_persistent_edc_harvesting_supported(adev))
> > amdgpu_ras_reset_error_status(adev, AMDGPU_RAS_BLOCK__GFX);
> >
> > - r = amdgpu_ras_block_late_init(adev, ras_block);
> > - if (r)
> > - return r;
> > + r = amdgpu_ras_block_late_init(adev, ras_block);
> > + if (r)
> > + return r;
> >
> > r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0);
> > if (r)
> > goto late_fini;
> > + } else {
> > + amdgpu_ras_feature_enable_on_boot(adev, ras_block, 0);
> > }
> >
> > return 0;
> > --
> > 2.17.1
> >
