Commit 8913f7ff authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: Guard calls to hdcp_ta and dtm_ta 



[Why]
The buffer used when calling psp is a shared buffer. If we have multiple calls
at the same time we can overwrite the buffer.

[How]
Add mutex to guard the shared buffer.

Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c0ed2ca6

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

+2 −0
Original line number Diff line number Diff line
@@ -888,6 +888,7 @@ static int psp_hdcp_load(struct psp_context *psp) 
	if (!ret) {

		psp->hdcp_context.hdcp_initialized = true;

		psp->hdcp_context.session_id = cmd->resp.session_id;

		mutex_init(&psp->hdcp_context.mutex);

	}



	kfree(cmd);
@@ -1033,6 +1034,7 @@ static int psp_dtm_load(struct psp_context *psp) 
	if (!ret) {

		psp->dtm_context.dtm_initialized = true;

		psp->dtm_context.session_id = cmd->resp.session_id;

		mutex_init(&psp->dtm_context.mutex);

	}



	kfree(cmd);

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

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ struct psp_hdcp_context { 
	struct amdgpu_bo	*hdcp_shared_bo;

	uint64_t		hdcp_shared_mc_addr;

	void			*hdcp_shared_buf;

	struct mutex		mutex;

};



struct psp_dtm_context {
@@ -169,6 +170,7 @@ struct psp_dtm_context { 
	struct amdgpu_bo	*dtm_shared_bo;

	uint64_t		dtm_shared_mc_addr;

	void			*dtm_shared_buf;

	struct mutex		mutex;

};



#define MEM_TRAIN_SYSTEM_SIGNATURE		0x54534942

drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c

+253 −167

File changed.

Preview size limit exceeded, changes collapsed.