[PATCH] drm/amdgpu: fix ordering of psp suspend

[PATCH] drm/amdgpu: fix ordering of psp suspend

[Alex Deucher]

The ordering of psp_tmr_terminate() and psp_asd_unload()
got reversed when the patches were applied to stable.

Fixes: 22ff658396b446 ("drm/amdgpu: asd function needs to be unloaded in suspend phase")
Fixes: 2c41c968c6f648 ("drm/amdgpu: add TMR destory function for psp")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.7.x
Cc: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 3c6f60c5b1a5..088f43ebdceb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -1679,15 +1679,15 @@ static int psp_suspend(void *handle)
 		}
 	}
 
-	ret = psp_tmr_terminate(psp);
+	ret = psp_asd_unload(psp);
 	if (ret) {
-		DRM_ERROR("Falied to terminate tmr\n");
+		DRM_ERROR("Failed to unload asd\n");
 		return ret;
 	}
 
-	ret = psp_asd_unload(psp);
+	ret = psp_tmr_terminate(psp);
 	if (ret) {
-		DRM_ERROR("Failed to unload asd\n");
+		DRM_ERROR("Falied to terminate tmr\n");
 		return ret;
 	}
 
-- 
2.25.4

Re: [PATCH] drm/amdgpu: fix ordering of psp suspend

[Greg KH]

On Wed, Aug 05, 2020 at 05:57:00PM -0400, Alex Deucher wrote:
> The ordering of psp_tmr_terminate() and psp_asd_unload()
> got reversed when the patches were applied to stable.
> 
> Fixes: 22ff658396b446 ("drm/amdgpu: asd function needs to be unloaded in suspend phase")
> Fixes: 2c41c968c6f648 ("drm/amdgpu: add TMR destory function for psp")
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org # 5.7.x
> Cc: Huang Rui <ray.huang@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

What is the git commit id of this patch in Linus's tree?

thanks,

greg k-h

Re: [PATCH] drm/amdgpu: fix ordering of psp suspend

[Alex Deucher]

On Thu, Aug 6, 2020 at 7:10 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Wed, Aug 05, 2020 at 05:57:00PM -0400, Alex Deucher wrote:
> > The ordering of psp_tmr_terminate() and psp_asd_unload()
> > got reversed when the patches were applied to stable.
> >
> > Fixes: 22ff658396b446 ("drm/amdgpu: asd function needs to be unloaded in suspend phase")
> > Fixes: 2c41c968c6f648 ("drm/amdgpu: add TMR destory function for psp")
> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> > Cc: stable@vger.kernel.org # 5.7.x
> > Cc: Huang Rui <ray.huang@amd.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
>
> What is the git commit id of this patch in Linus's tree?

It doesn't exist in Linus' tree.  The order is correct in 5.8 and
newer.  The order got reversed when the patches were applied to
stable.

Alex

>
> thanks,
>
> greg k-h

Re: [PATCH] drm/amdgpu: fix ordering of psp suspend

[Greg KH]

On Thu, Aug 06, 2020 at 09:42:51AM -0400, Alex Deucher wrote:
> On Thu, Aug 6, 2020 at 7:10 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, Aug 05, 2020 at 05:57:00PM -0400, Alex Deucher wrote:
> > > The ordering of psp_tmr_terminate() and psp_asd_unload()
> > > got reversed when the patches were applied to stable.
> > >
> > > Fixes: 22ff658396b446 ("drm/amdgpu: asd function needs to be unloaded in suspend phase")
> > > Fixes: 2c41c968c6f648 ("drm/amdgpu: add TMR destory function for psp")
> > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> > > Cc: stable@vger.kernel.org # 5.7.x
> > > Cc: Huang Rui <ray.huang@amd.com>
> > > ---
> > >  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++----
> > >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > What is the git commit id of this patch in Linus's tree?
> 
> It doesn't exist in Linus' tree.  The order is correct in 5.8 and
> newer.  The order got reversed when the patches were applied to
> stable.

Than this needs to be explicitly called out and documented in the patch,
otherwise we have no idea what is going on...

thanks,

greg k-h

Re: [PATCH] drm/amdgpu: fix ordering of psp suspend

[Alex Deucher]

On Thu, Aug 6, 2020 at 10:44 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Thu, Aug 06, 2020 at 09:42:51AM -0400, Alex Deucher wrote:
> > On Thu, Aug 6, 2020 at 7:10 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> > >
> > > On Wed, Aug 05, 2020 at 05:57:00PM -0400, Alex Deucher wrote:
> > > > The ordering of psp_tmr_terminate() and psp_asd_unload()
> > > > got reversed when the patches were applied to stable.
> > > >
> > > > Fixes: 22ff658396b446 ("drm/amdgpu: asd function needs to be unloaded in suspend phase")
> > > > Fixes: 2c41c968c6f648 ("drm/amdgpu: add TMR destory function for psp")
> > > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> > > > Cc: stable@vger.kernel.org # 5.7.x
> > > > Cc: Huang Rui <ray.huang@amd.com>
> > > > ---
> > > >  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++----
> > > >  1 file changed, 4 insertions(+), 4 deletions(-)
> > >
> > > What is the git commit id of this patch in Linus's tree?
> >
> > It doesn't exist in Linus' tree.  The order is correct in 5.8 and
> > newer.  The order got reversed when the patches were applied to
> > stable.
>
> Than this needs to be explicitly called out and documented in the patch,
> otherwise we have no idea what is going on...

I'll respin and make it explicit.  thanks!

Alex