Commit 999a69e2 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: switch to common rlc_autoload helper 



drop IP specific psp function for rlc autoload since
the autoload_supported was introduced to mark ASICs
that support rlc_autoload

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c797c583

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

+1 −1
Original line number Diff line number Diff line
@@ -1646,7 +1646,7 @@ static int psp_np_fw_load(struct psp_context *psp) 
		/* Start rlc autoload after psp recieved all the gfx firmware */

		if (psp->autoload_supported && ucode->ucode_id == (amdgpu_sriov_vf(adev) ?

		    AMDGPU_UCODE_ID_CP_MEC2 : AMDGPU_UCODE_ID_RLC_G)) {

			ret = psp_rlc_autoload(psp);

			ret = psp_rlc_autoload_start(psp);

			if (ret) {

				DRM_ERROR("Failed to start rlc autoload\n");

				return ret;

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

+0 −3
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ struct psp_funcs 
			    enum psp_ring_type ring_type);

	bool (*smu_reload_quirk)(struct psp_context *psp);

	int (*mode1_reset)(struct psp_context *psp);

	int (*rlc_autoload_start)(struct psp_context *psp);

	int (*mem_training_init)(struct psp_context *psp);

	void (*mem_training_fini)(struct psp_context *psp);

	int (*mem_training)(struct psp_context *psp, uint32_t ops);
@@ -307,8 +306,6 @@ struct amdgpu_psp_funcs { 
		((psp)->funcs->smu_reload_quirk ? (psp)->funcs->smu_reload_quirk((psp)) : false)

#define psp_mode1_reset(psp) \

		((psp)->funcs->mode1_reset ? (psp)->funcs->mode1_reset((psp)) : false)

#define psp_rlc_autoload(psp) \

		((psp)->funcs->rlc_autoload_start ? (psp)->funcs->rlc_autoload_start((psp)) : 0)

#define psp_mem_training_init(psp) \

	((psp)->funcs->mem_training_init ? (psp)->funcs->mem_training_init((psp)) : 0)

#define psp_mem_training_fini(psp) \

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

+0 −6
Original line number Diff line number Diff line
@@ -524,11 +524,6 @@ static int psp_v11_0_mode1_reset(struct psp_context *psp) 
	return 0;

}



static int psp_v11_0_rlc_autoload_start(struct psp_context *psp)

{

	return psp_rlc_autoload_start(psp);

}



static int psp_v11_0_memory_training_send_msg(struct psp_context *psp, int msg)

{

	int ret;
@@ -825,7 +820,6 @@ static const struct psp_funcs psp_v11_0_funcs = { 
	.ring_stop = psp_v11_0_ring_stop,

	.ring_destroy = psp_v11_0_ring_destroy,

	.mode1_reset = psp_v11_0_mode1_reset,

	.rlc_autoload_start = psp_v11_0_rlc_autoload_start,

	.mem_training_init = psp_v11_0_memory_training_init,

	.mem_training_fini = psp_v11_0_memory_training_fini,

	.mem_training = psp_v11_0_memory_training,

CRA Git | Maintained and supported by SUSTech CRA and CCSE