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

Commit 02558a00 authored by Ken Wang's avatar Ken Wang Committed by Alex Deucher
Browse files

drm/amdgpu: add me/ce/pfp_feature_version interface query 



Provide this information to usermode drivers.  We were previously
missing this info.

Signed-off-by: default avatarKen Wang <Qingqing.Wang@amd.com>
Reviewed-by: default avatarJammy Zhou <Jammy.Zhou@amd.com>
parent a101a899

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

+3 −0
Original line number Diff line number Diff line
@@ -1125,6 +1125,9 @@ struct amdgpu_gfx { 
	uint32_t			mec_fw_version;

	const struct firmware		*mec2_fw; /* MEC2 firmware */

	uint32_t			mec2_fw_version;

	uint32_t			me_feature_version;

	uint32_t			ce_feature_version;

	uint32_t			pfp_feature_version;

	struct amdgpu_ring		gfx_ring[AMDGPU_MAX_GFX_RINGS];

	unsigned			num_gfx_rings;

	struct amdgpu_ring		compute_ring[AMDGPU_MAX_COMPUTE_RINGS];

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

+3 −3
Original line number Diff line number Diff line
@@ -291,15 +291,15 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file 
			break;

		case AMDGPU_INFO_FW_GFX_ME:

			fw_info.ver = adev->gfx.me_fw_version;

			fw_info.feature = 0;

			fw_info.feature = adev->gfx.me_feature_version;

			break;

		case AMDGPU_INFO_FW_GFX_PFP:

			fw_info.ver = adev->gfx.pfp_fw_version;

			fw_info.feature = 0;

			fw_info.feature = adev->gfx.pfp_feature_version;

			break;

		case AMDGPU_INFO_FW_GFX_CE:

			fw_info.ver = adev->gfx.ce_fw_version;

			fw_info.feature = 0;

			fw_info.feature = adev->gfx.ce_feature_version;

			break;

		case AMDGPU_INFO_FW_GFX_RLC:

			fw_info.ver = adev->gfx.rlc_fw_version;

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

+3 −0
Original line number Diff line number Diff line
@@ -2705,6 +2705,9 @@ static int gfx_v7_0_cp_gfx_load_microcode(struct amdgpu_device *adev) 
	adev->gfx.pfp_fw_version = le32_to_cpu(pfp_hdr->header.ucode_version);

	adev->gfx.ce_fw_version = le32_to_cpu(ce_hdr->header.ucode_version);

	adev->gfx.me_fw_version = le32_to_cpu(me_hdr->header.ucode_version);

	adev->gfx.me_feature_version = le32_to_cpu(me_hdr->ucode_feature_version);

	adev->gfx.ce_feature_version = le32_to_cpu(ce_hdr->ucode_feature_version);

	adev->gfx.pfp_feature_version = le32_to_cpu(pfp_hdr->ucode_feature_version);



	gfx_v7_0_cp_gfx_enable(adev, false);

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

+3 −0
Original line number Diff line number Diff line
@@ -2279,6 +2279,9 @@ static int gfx_v8_0_cp_gfx_load_microcode(struct amdgpu_device *adev) 
	adev->gfx.pfp_fw_version = le32_to_cpu(pfp_hdr->header.ucode_version);

	adev->gfx.ce_fw_version = le32_to_cpu(ce_hdr->header.ucode_version);

	adev->gfx.me_fw_version = le32_to_cpu(me_hdr->header.ucode_version);

	adev->gfx.me_feature_version = le32_to_cpu(me_hdr->ucode_feature_version);

	adev->gfx.ce_feature_version = le32_to_cpu(ce_hdr->ucode_feature_version);

	adev->gfx.pfp_feature_version = le32_to_cpu(pfp_hdr->ucode_feature_version);



	gfx_v8_0_cp_gfx_enable(adev, false);