Commit 50e275e8 authored by Xiaojie Yuan's avatar Xiaojie Yuan Committed by Alex Deucher
Browse files

drm/amdgpu: remove redundant argument for psp_funcs::cmd_submit callback 



Signed-off-by: default avatarXiaojie Yuan <xiaojie.yuan@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c181159a

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

+1 −2
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ psp_cmd_submit_buf(struct psp_context *psp, 
	memcpy(psp->cmd_buf_mem, cmd, sizeof(struct psp_gfx_cmd_resp));



	index = atomic_inc_return(&psp->fence_value);

	ret = psp_cmd_submit(psp, ucode, psp->cmd_buf_mc_addr,

			     fence_mc_addr, index);

	ret = psp_cmd_submit(psp, psp->cmd_buf_mc_addr, fence_mc_addr, index);

	if (ret) {

		atomic_dec(&psp->fence_value);

		mutex_unlock(&psp->mutex);

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

+2 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct psp_funcs 
	int (*ring_destroy)(struct psp_context *psp,

			    enum psp_ring_type ring_type);

	int (*cmd_submit)(struct psp_context *psp,

			  struct amdgpu_firmware_info *ucode,

			  uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,

			  int index);

	bool (*compare_sram_data)(struct psp_context *psp,
@@ -223,8 +222,8 @@ struct amdgpu_psp_funcs { 
#define psp_ring_create(psp, type) (psp)->funcs->ring_create((psp), (type))

#define psp_ring_stop(psp, type) (psp)->funcs->ring_stop((psp), (type))

#define psp_ring_destroy(psp, type) ((psp)->funcs->ring_destroy((psp), (type)))

#define psp_cmd_submit(psp, ucode, cmd_mc, fence_mc, index) \

		(psp)->funcs->cmd_submit((psp), (ucode), (cmd_mc), (fence_mc), (index))

#define psp_cmd_submit(psp, cmd_mc, fence_mc, index) \

		(psp)->funcs->cmd_submit((psp), (cmd_mc), (fence_mc), (index))

#define psp_compare_sram_data(psp, ucode, type) \

		(psp)->funcs->compare_sram_data((psp), (ucode), (type))

#define psp_init_microcode(psp) \

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

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ static int psp_v10_0_ring_destroy(struct psp_context *psp, 
}



static int psp_v10_0_cmd_submit(struct psp_context *psp,

				struct amdgpu_firmware_info *ucode,

				uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,

				int index)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -498,7 +498,6 @@ static int psp_v11_0_ring_destroy(struct psp_context *psp, 
}



static int psp_v11_0_cmd_submit(struct psp_context *psp,

			       struct amdgpu_firmware_info *ucode,

			       uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,

			       int index)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ static int psp_v12_0_ring_destroy(struct psp_context *psp, 
}



static int psp_v12_0_cmd_submit(struct psp_context *psp,

			       struct amdgpu_firmware_info *ucode,

			       uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,

			       int index)

{