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

Commit 3ac952b1 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: add VCN to firmware query interface 



Need to be able to query the VCN firmware version from
userspace to determine supported features, etc.

Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 690dc626

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,10 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info, 
		fw_info->ver = adev->uvd.fw_version;

		fw_info->ver = adev->uvd.fw_version;

		fw_info->feature = 0;

		fw_info->feature = 0;

		break;

		break;

	case AMDGPU_INFO_FW_VCN:

		fw_info->ver = adev->vcn.fw_version;

		fw_info->feature = 0;

		break;

	case AMDGPU_INFO_FW_GMC:

	case AMDGPU_INFO_FW_GMC:

		fw_info->ver = adev->gmc.fw_version;

		fw_info->ver = adev->gmc.fw_version;

		fw_info->feature = 0;

		fw_info->feature = 0;
@@ -1198,6 +1202,14 @@ static int amdgpu_debugfs_firmware_info(struct seq_file *m, void *data) 
			   i, fw_info.feature, fw_info.ver);

			   i, fw_info.feature, fw_info.ver);

	}

	}





	/* VCN */

	query_fw.fw_type = AMDGPU_INFO_FW_VCN;

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

	if (ret)

		return ret;

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

		   fw_info.feature, fw_info.ver);



	return 0;

	return 0;

}

}

include/uapi/drm/amdgpu_drm.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -618,6 +618,8 @@ struct drm_amdgpu_cs_chunk_data { 
	#define AMDGPU_INFO_FW_SOS		0x0c

	#define AMDGPU_INFO_FW_SOS		0x0c

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

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

	#define AMDGPU_INFO_FW_ASD		0x0d

	#define AMDGPU_INFO_FW_ASD		0x0d

	/* Subquery id: Query VCN firmware version */

	#define AMDGPU_INFO_FW_VCN		0x0e

/* number of bytes moved for TTM migration */

/* number of bytes moved for TTM migration */

#define AMDGPU_INFO_NUM_BYTES_MOVED		0x0f

#define AMDGPU_INFO_NUM_BYTES_MOVED		0x0f

/* the used VRAM size */

/* the used VRAM size */