Re: [PATCH v4 06/15] drm/amdgpu: validate suspend before function call

["Khatri, Sunil" <sunil.khatri@xxxxxxx>]

On 10/17/2024 5:24 PM, Christian König wrote:
> Am 17.10.24 um 12:06 schrieb Sunil Khatri:
> > Before making a function call to suspend, validate
> > the function pointer like we do in sw_init.
>
> Same comment as on patch #5, please add an amdgpu_ip_block_suspend() 
> function and just call it multiple times.
> Noted.

> Regards,
> Christian.
>
> > Signed-off-by: Sunil Khatri <sunil.khatri@xxxxxxx>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/aldebaran.c      | 15 ++++++------
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c  | 26 ++++++++++++---------
> >   drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c   | 12 ++++++----
> >   drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 15 ++++++------
> >   drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c   | 15 ++++++------
> >   5 files changed, 46 insertions(+), 37 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/aldebaran.c 
> > b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> > index c1ff24335a0c..e55d680d95ce 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/aldebaran.c
> > @@ -85,13 +85,14 @@ static int aldebaran_mode2_suspend_ip(struct 
> > amdgpu_device *adev)
> >                     AMD_IP_BLOCK_TYPE_SDMA))
> >               continue;
> >   -        r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > -
> > -        if (r) {
> > -            dev_err(adev->dev,
> > -                "suspend of IP block <%s> failed %d\n",
> > - adev->ip_blocks[i].version->funcs->name, r);
> > -            return r;
> > +        if (adev->ip_blocks[i].version->funcs->suspend) {
> > +            r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > +            if (r) {
> > +                dev_err(adev->dev,
> > +                    "suspend of IP block <%s> failed %d\n",
> > + adev->ip_blocks[i].version->funcs->name, r);
> > +                return r;
> > +            }
> >           }
> >             adev->ip_blocks[i].status.hw = false;
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index 96cecd4a636b..fda89aeb4d1b 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -3478,12 +3478,14 @@ static int 
> > amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
> >               continue;
> >             /* XXX handle errors */
> > -        r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > -        /* XXX handle errors */
> > -        if (r) {
> > -            DRM_ERROR("suspend of IP block <%s> failed %d\n",
> > - adev->ip_blocks[i].version->funcs->name, r);
> > -            return r;
> > +        if (adev->ip_blocks[i].version->funcs->suspend) {
> > +            r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > +            /* XXX handle errors */
> > +            if (r) {
> > +                DRM_ERROR("suspend of IP block <%s> failed %d\n",
> > + adev->ip_blocks[i].version->funcs->name, r);
> > +                return r;
> > +            }
> >           }
> >             adev->ip_blocks[i].status.hw = false;
> > @@ -3560,11 +3562,13 @@ static int 
> > amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
> >               continue;
> >             /* XXX handle errors */
> > -        r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > -        /* XXX handle errors */
> > -        if (r) {
> > -            DRM_ERROR("suspend of IP block <%s> failed %d\n",
> > - adev->ip_blocks[i].version->funcs->name, r);
> > +        if (adev->ip_blocks[i].version->funcs->suspend) {
> > +            r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > +            /* XXX handle errors */
> > +            if (r) {
> > +                DRM_ERROR("suspend of IP block <%s> failed %d\n",
> > + adev->ip_blocks[i].version->funcs->name, r);
> > +            }
> >           }
> >           adev->ip_blocks[i].status.hw = false;
> >           /* handle putting the SMC in the appropriate state */
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> > index 3e2724590dbf..6bc75aa1c3b1 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c
> > @@ -40,11 +40,13 @@ static int 
> > amdgpu_reset_xgmi_reset_on_init_suspend(struct amdgpu_device *adev)
> >               continue;
> >             /* XXX handle errors */
> > -        r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > -        /* XXX handle errors */
> > -        if (r) {
> > -            dev_err(adev->dev, "suspend of IP block <%s> failed %d",
> > - adev->ip_blocks[i].version->funcs->name, r);
> > +        if (adev->ip_blocks[i].version->funcs->suspend) {
> > +            r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > +            /* XXX handle errors */
> > +            if (r) {
> > +                dev_err(adev->dev, "suspend of IP block <%s> failed 
> > %d",
> > + adev->ip_blocks[i].version->funcs->name, r);
> > +            }
> >           }
> >           adev->ip_blocks[i].status.hw = false;
> >       }
> > diff --git a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c 
> > b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> > index 475b7df3a908..10dece12509f 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c
> > @@ -81,13 +81,14 @@ static int sienna_cichlid_mode2_suspend_ip(struct 
> > amdgpu_device *adev)
> >                     AMD_IP_BLOCK_TYPE_SDMA))
> >               continue;
> >   -        r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > -
> > -        if (r) {
> > -            dev_err(adev->dev,
> > -                "suspend of IP block <%s> failed %d\n",
> > - adev->ip_blocks[i].version->funcs->name, r);
> > -            return r;
> > +        if (adev->ip_blocks[i].version->funcs->suspend) {
> > +            r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > +            if (r) {
> > +                dev_err(adev->dev,
> > +                    "suspend of IP block <%s> failed %d\n",
> > + adev->ip_blocks[i].version->funcs->name, r);
> > +                return r;
> > +            }
> >           }
> >           adev->ip_blocks[i].status.hw = false;
> >       }
> > diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c 
> > b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> > index 5ea9090b5040..ab049f0b4d39 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c
> > @@ -80,13 +80,14 @@ static int smu_v13_0_10_mode2_suspend_ip(struct 
> > amdgpu_device *adev)
> >                     AMD_IP_BLOCK_TYPE_MES))
> >               continue;
> >   -        r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > -
> > -        if (r) {
> > -            dev_err(adev->dev,
> > -                "suspend of IP block <%s> failed %d\n",
> > - adev->ip_blocks[i].version->funcs->name, r);
> > -            return r;
> > +        if (adev->ip_blocks[i].version->funcs->suspend) {
> > +            r = 
> > adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
> > +            if (r) {
> > +                dev_err(adev->dev,
> > +                    "suspend of IP block <%s> failed %d\n",
> > + adev->ip_blocks[i].version->funcs->name, r);
> > +                return r;
> > +            }
> >           }
> >           adev->ip_blocks[i].status.hw = false;
> >       }