[AMD Official Use Only - General]

Squashed into one patch now.
Thanks Alex.

> -----Original Message-----
> From: Alex Deucher <alexdeucher@gmail.com>
> Sent: Thursday, January 5, 2023 11:28 AM
> To: Liu, Aaron <Aaron.Liu@amd.com>
> Cc: amd-gfx@lists.freedesktop.org; Liu, HaoPing (Alan)
> <HaoPing.Liu@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>;
> Xiao, Shane <shane.xiao@amd.com>
> Subject: Re: [PATCH 2/2] drm/amd: update securedisplay_cmd to
> ta_securedisplay_cmd
>
> These two patches should be squashed together to avoid breaking the build.
>
> Alex
>
> On Wed, Jan 4, 2023 at 8:04 PM Aaron Liu <aaron.liu@amd.com> wrote:
> >
> > This patch updates securedisplay_cmd to ta_securedisplay_cmd starting
> > from amd-ta_securedisplay-v27.00.00.08.
> >
> > Signed-off-by: Aaron Liu <aaron.liu@amd.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c               | 2 +-
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c     | 8 ++++----
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h     | 2 +-
> >  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +-
> >  4 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > index 0706afb11577..2bebda7de604 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > @@ -1907,7 +1907,7 @@ int psp_rap_invoke(struct psp_context *psp,
> > uint32_t ta_cmd_id, enum ta_rap_stat  static int
> > psp_securedisplay_initialize(struct psp_context *psp)  {
> >         int ret;
> > -       struct securedisplay_cmd *securedisplay_cmd;
> > +       struct ta_securedisplay_cmd *securedisplay_cmd;
> >
> >         /*
> >          * TODO: bypass the initialize in sriov for now diff --git
> > a/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
> > index 2c1d82fc4c34..8ed0e073656f 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
> > @@ -77,11 +77,11 @@ void psp_securedisplay_parse_resp_status(struct
> psp_context *psp,
> >         }
> >  }
> >
> > -void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct
> > securedisplay_cmd **cmd,
> > +void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct
> > +ta_securedisplay_cmd **cmd,
> >         enum ta_securedisplay_command command_id)  {
> > -       *cmd = (struct securedisplay_cmd *)psp-
> >securedisplay_context.context.mem_context.shared_buf;
> > -       memset(*cmd, 0, sizeof(struct securedisplay_cmd));
> > +       *cmd = (struct ta_securedisplay_cmd *)psp-
> >securedisplay_context.context.mem_context.shared_buf;
> > +       memset(*cmd, 0, sizeof(struct ta_securedisplay_cmd));
> >         (*cmd)->status = TA_SECUREDISPLAY_STATUS__GENERIC_FAILURE;
> >         (*cmd)->cmd_id = command_id;
> >  }
> > @@ -93,7 +93,7 @@ static ssize_t
> > amdgpu_securedisplay_debugfs_write(struct file *f, const char __u  {
> >         struct amdgpu_device *adev = (struct amdgpu_device *)file_inode(f)-
> >i_private;
> >         struct psp_context *psp = &adev->psp;
> > -       struct securedisplay_cmd *securedisplay_cmd;
> > +       struct ta_securedisplay_cmd *securedisplay_cmd;
> >         struct drm_device *dev = adev_to_drm(adev);
> >         uint32_t phy_id;
> >         uint32_t op;
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h
> > index fe98574748f4..456ad68ed4b2 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h
> > @@ -30,7 +30,7 @@
> >  void amdgpu_securedisplay_debugfs_init(struct amdgpu_device *adev);
> > void psp_securedisplay_parse_resp_status(struct psp_context *psp,
> >                 enum ta_securedisplay_status status); -void
> > psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct
> > securedisplay_cmd **cmd,
> > +void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct
> > +ta_securedisplay_cmd **cmd,
> >                 enum ta_securedisplay_command command_id);
> >
> >  #endif
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
> > b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
> > index ad73e5855580..8841c447d0e2 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
> > @@ -103,7 +103,7 @@ static void
> > amdgpu_dm_crtc_notify_ta_to_read(struct work_struct *work)  {
> >         struct secure_display_context *secure_display_ctx;
> >         struct psp_context *psp;
> > -       struct securedisplay_cmd *securedisplay_cmd;
> > +       struct ta_securedisplay_cmd *securedisplay_cmd;
> >         struct drm_crtc *crtc;
> >         struct dc_stream_state *stream;
> >         uint8_t phy_inst;
> > --
> > 2.39.0
> >