Commit 0a305e34 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: increase size of psp fw_name string(v2) 



Increase fw_name string size so longer chip name can be stored.

v2: define macro for the length of psp fw name.

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent db1f8a8f

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

+2 −2
Original line number Diff line number Diff line
@@ -2384,7 +2384,7 @@ int psp_init_asd_microcode(struct psp_context *psp, 
			   const char *chip_name)

{

	struct amdgpu_device *adev = psp->adev;

	char fw_name[30];

	char fw_name[PSP_FW_NAME_LEN];

	const struct psp_firmware_header_v1_0 *asd_hdr;

	int err = 0;
@@ -2456,7 +2456,7 @@ int psp_init_sos_microcode(struct psp_context *psp, 
			   const char *chip_name)

{

	struct amdgpu_device *adev = psp->adev;

	char fw_name[30];

	char fw_name[PSP_FW_NAME_LEN];

	const struct psp_firmware_header_v1_0 *sos_hdr;

	const struct psp_firmware_header_v1_1 *sos_hdr_v1_1;

	const struct psp_firmware_header_v1_2 *sos_hdr_v1_2;

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#define PSP_DTM_SHARED_MEM_SIZE	0x4000

#define PSP_RAP_SHARED_MEM_SIZE	0x4000

#define PSP_SHARED_MEM_SIZE		0x4000

#define PSP_FW_NAME_LEN		0x24



struct psp_context;

struct psp_xgmi_node_info;

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

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 
{

	struct amdgpu_device *adev = psp->adev;

	const char *chip_name;

	char fw_name[30];

	char fw_name[PSP_FW_NAME_LEN];

	int err = 0;

	const struct ta_firmware_header_v1_0 *ta_hdr;