tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Aaron Liu
and committed by
Alex Deucher
f6e856e7
3693c1ae
+19
-19
+1
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+1
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+4
-4
drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
+4
-4
drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
···
77
77
}
78
78
}
79
79
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,
81
81
enum ta_securedisplay_command command_id)
82
82
{
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));
85
85
(*cmd)->status = TA_SECUREDISPLAY_STATUS__GENERIC_FAILURE;
86
86
(*cmd)->cmd_id = command_id;
87
87
}
···
93
93
{
94
94
struct amdgpu_device *adev = (struct amdgpu_device *)file_inode(f)->i_private;
95
95
struct psp_context *psp = &adev->psp;
96
-
struct securedisplay_cmd *securedisplay_cmd;
96
+
struct ta_securedisplay_cmd *securedisplay_cmd;
97
97
struct drm_device *dev = adev_to_drm(adev);
98
98
uint32_t phy_id;
99
99
uint32_t op;
+1
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h
+1
-1
drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h
···
30
30
void amdgpu_securedisplay_debugfs_init(struct amdgpu_device *adev);
31
31
void psp_securedisplay_parse_resp_status(struct psp_context *psp,
32
32
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,
34
34
enum ta_securedisplay_command command_id);
35
35
36
36
#endif
+12
-12
drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h
+12
-12
drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h
···
55
55
TA_SECUREDISPLAY_STATUS__MAX = 0x7FFFFFFF,/* Maximum Value for status*/
56
56
};
57
57
58
-
/** @enum ta_securedisplay_max_phy
58
+
/** @enum ta_securedisplay_phy_ID
59
59
* Physical ID number to use for reading corresponding DIO Scratch register for ROI
60
60
*/
61
-
enum ta_securedisplay_max_phy {
61
+
enum ta_securedisplay_phy_ID {
62
62
TA_SECUREDISPLAY_PHY0 = 0,
63
63
TA_SECUREDISPLAY_PHY1 = 1,
64
64
TA_SECUREDISPLAY_PHY2 = 2,
···
139
139
uint32_t reserved[4];
140
140
};
141
141
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 */
152
152
};
153
153
154
154
#endif //_TA_SECUREDISPLAY_IF_H
+1
-1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
+1
-1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c
···
103
103
{
104
104
struct secure_display_context *secure_display_ctx;
105
105
struct psp_context *psp;
106
-
struct securedisplay_cmd *securedisplay_cmd;
106
+
struct ta_securedisplay_cmd *securedisplay_cmd;
107
107
struct drm_crtc *crtc;
108
108
struct dc_stream_state *stream;
109
109
uint8_t phy_inst;