Skip to content

Commit f6e856e

Browse files
Aaron Liualexdeucher
authored andcommitted
drm/amdgpu: update ta_secureDisplay_if.h to v27.00.00.08
1. Rename securedisplay_cmd to ta_securedisplay_cmd. 2. Rename ta_securedisplay_max_phy to ta_securedisplay_phy_ID. 3. update securedisplay_cmd to ta_securedisplay_cmd Signed-off-by: Aaron Liu <aaron.liu@amd.com> Signed-off-by: Shane Xiao <shane.xiao@amd.com> Reviewed-by: Alan Liu <HaoPing.Liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 3693c1a commit f6e856e

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@ int psp_rap_invoke(struct psp_context *psp, uint32_t ta_cmd_id, enum ta_rap_stat
19071907
static int psp_securedisplay_initialize(struct psp_context *psp)
19081908
{
19091909
int ret;
1910-
struct securedisplay_cmd *securedisplay_cmd;
1910+
struct ta_securedisplay_cmd *securedisplay_cmd;
19111911

19121912
/*
19131913
* TODO: bypass the initialize in sriov for now

drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ void psp_securedisplay_parse_resp_status(struct psp_context *psp,
7777
}
7878
}
7979

80-
void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct securedisplay_cmd **cmd,
80+
void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct ta_securedisplay_cmd **cmd,
8181
enum ta_securedisplay_command command_id)
8282
{
83-
*cmd = (struct securedisplay_cmd *)psp->securedisplay_context.context.mem_context.shared_buf;
84-
memset(*cmd, 0, sizeof(struct securedisplay_cmd));
83+
*cmd = (struct ta_securedisplay_cmd *)psp->securedisplay_context.context.mem_context.shared_buf;
84+
memset(*cmd, 0, sizeof(struct ta_securedisplay_cmd));
8585
(*cmd)->status = TA_SECUREDISPLAY_STATUS__GENERIC_FAILURE;
8686
(*cmd)->cmd_id = command_id;
8787
}
@@ -93,7 +93,7 @@ static ssize_t amdgpu_securedisplay_debugfs_write(struct file *f, const char __u
9393
{
9494
struct amdgpu_device *adev = (struct amdgpu_device *)file_inode(f)->i_private;
9595
struct psp_context *psp = &adev->psp;
96-
struct securedisplay_cmd *securedisplay_cmd;
96+
struct ta_securedisplay_cmd *securedisplay_cmd;
9797
struct drm_device *dev = adev_to_drm(adev);
9898
uint32_t phy_id;
9999
uint32_t op;

drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
void amdgpu_securedisplay_debugfs_init(struct amdgpu_device *adev);
3131
void psp_securedisplay_parse_resp_status(struct psp_context *psp,
3232
enum ta_securedisplay_status status);
33-
void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct securedisplay_cmd **cmd,
33+
void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct ta_securedisplay_cmd **cmd,
3434
enum ta_securedisplay_command command_id);
3535

3636
#endif

drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ enum ta_securedisplay_status {
5555
TA_SECUREDISPLAY_STATUS__MAX = 0x7FFFFFFF,/* Maximum Value for status*/
5656
};
5757

58-
/** @enum ta_securedisplay_max_phy
58+
/** @enum ta_securedisplay_phy_ID
5959
* Physical ID number to use for reading corresponding DIO Scratch register for ROI
6060
*/
61-
enum ta_securedisplay_max_phy {
61+
enum ta_securedisplay_phy_ID {
6262
TA_SECUREDISPLAY_PHY0 = 0,
6363
TA_SECUREDISPLAY_PHY1 = 1,
6464
TA_SECUREDISPLAY_PHY2 = 2,
@@ -139,16 +139,16 @@ union ta_securedisplay_cmd_output {
139139
uint32_t reserved[4];
140140
};
141141

142-
/** @struct securedisplay_cmd
143-
* Secure Display Command which is shared buffer memory
144-
*/
145-
struct securedisplay_cmd {
146-
uint32_t cmd_id; /* +0 Bytes Command ID */
147-
enum ta_securedisplay_status status; /* +4 Bytes Status of Secure Display TA */
148-
uint32_t reserved[2]; /* +8 Bytes Reserved */
149-
union ta_securedisplay_cmd_input securedisplay_in_message; /* +16 Bytes Input Buffer */
150-
union ta_securedisplay_cmd_output securedisplay_out_message;/* +32 Bytes Output Buffer */
151-
/**@note Total 48 Bytes */
142+
/** @struct ta_securedisplay_cmd
143+
* Secure display command which is shared buffer memory
144+
*/
145+
struct ta_securedisplay_cmd {
146+
uint32_t cmd_id; /**< +0 Bytes Command ID */
147+
enum ta_securedisplay_status status; /**< +4 Bytes Status code returned by the secure display TA */
148+
uint32_t reserved[2]; /**< +8 Bytes Reserved */
149+
union ta_securedisplay_cmd_input securedisplay_in_message; /**< +16 Bytes Command input buffer */
150+
union ta_securedisplay_cmd_output securedisplay_out_message; /**< +32 Bytes Command output buffer */
151+
/**@note Total 48 Bytes */
152152
};
153153

154154
#endif //_TA_SECUREDISPLAY_IF_H

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static void amdgpu_dm_crtc_notify_ta_to_read(struct work_struct *work)
103103
{
104104
struct secure_display_context *secure_display_ctx;
105105
struct psp_context *psp;
106-
struct securedisplay_cmd *securedisplay_cmd;
106+
struct ta_securedisplay_cmd *securedisplay_cmd;
107107
struct drm_crtc *crtc;
108108
struct dc_stream_state *stream;
109109
uint8_t phy_inst;

0 commit comments

Comments
 (0)