Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a7ed07e authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: add psp firmware info into info query and debugfs 



Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0e5ca0d1

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

+25 −0
Original line number Diff line number Diff line
@@ -208,6 +208,14 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info, 
		fw_info->ver = adev->sdma.instance[query_fw->index].fw_version;

		fw_info->feature = adev->sdma.instance[query_fw->index].feature_version;

		break;

	case AMDGPU_INFO_FW_SOS:

		fw_info->ver = adev->psp.sos_fw_version;

		fw_info->feature = adev->psp.sos_feature_version;

		break;

	case AMDGPU_INFO_FW_ASD:

		fw_info->ver = adev->psp.asd_fw_version;

		fw_info->feature = adev->psp.asd_feature_version;

		break;

	default:

		return -EINVAL;

	}
@@ -1080,6 +1088,23 @@ static int amdgpu_debugfs_firmware_info(struct seq_file *m, void *data) 
			   fw_info.feature, fw_info.ver);

	}



	/* PSP SOS */

	query_fw.fw_type = AMDGPU_INFO_FW_SOS;

	ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);

	if (ret)

		return ret;

	seq_printf(m, "SOS feature version: %u, firmware version: 0x%08x\n",

		   fw_info.feature, fw_info.ver);





	/* PSP ASD */

	query_fw.fw_type = AMDGPU_INFO_FW_ASD;

	ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);

	if (ret)

		return ret;

	seq_printf(m, "ASD feature version: %u, firmware version: 0x%08x\n",

		   fw_info.feature, fw_info.ver);



	/* SMC */

	query_fw.fw_type = AMDGPU_INFO_FW_SMC;

	ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);

include/uapi/drm/amdgpu_drm.h

+4 −0
Original line number Diff line number Diff line
@@ -523,6 +523,10 @@ struct drm_amdgpu_cs_chunk_data { 
	#define AMDGPU_INFO_FW_SMC		0x0a

	/* Subquery id: Query SDMA firmware version */

	#define AMDGPU_INFO_FW_SDMA		0x0b

	/* Subquery id: Query PSP SOS firmware version */

	#define AMDGPU_INFO_FW_SOS		0x0c

	/* Subquery id: Query PSP ASD firmware version */

	#define AMDGPU_INFO_FW_ASD		0x0d

/* number of bytes moved for TTM migration */

#define AMDGPU_INFO_NUM_BYTES_MOVED		0x0f

/* the used VRAM size */