Commit baf3f8f3 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: handle SRIOV VCN revision parsing 



For SR-IOV, the IP discovery revision number encodes
additional information.  Handle that case here.

v2: drop additional IP versions

Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bab73f09

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

+14 −3
Original line number Diff line number Diff line
@@ -379,8 +379,21 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) 
				  ip->major, ip->minor,

				  ip->revision);



			if (le16_to_cpu(ip->hw_id) == VCN_HWID)

			if (le16_to_cpu(ip->hw_id) == VCN_HWID) {

				if (amdgpu_sriov_vf(adev)) {

					/* SR-IOV modifies each VCN’s revision (uint8)

					 * Bit [5:0]: original revision value

					 * Bit [7:6]: en/decode capability:

					 *     0b00 : VCN function normally

					 *     0b10 : encode is disabled

					 *     0b01 : decode is disabled

					 */

					adev->vcn.sriov_config[adev->vcn.num_vcn_inst] =

						(ip->revision & 0xc0) >> 6;

					ip->revision &= ~0xc0;

				}

				adev->vcn.num_vcn_inst++;

			}

			if (le16_to_cpu(ip->hw_id) == SDMA0_HWID ||

			    le16_to_cpu(ip->hw_id) == SDMA1_HWID ||

			    le16_to_cpu(ip->hw_id) == SDMA2_HWID ||
@@ -917,10 +930,8 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
			break;

		case IP_VERSION(3, 0, 0):

		case IP_VERSION(3, 0, 16):

		case IP_VERSION(3, 0, 64):

		case IP_VERSION(3, 1, 1):

		case IP_VERSION(3, 0, 2):

		case IP_VERSION(3, 0, 192):

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

			if (!amdgpu_sriov_vf(adev))

				amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);

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

+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

	case IP_VERSION(3, 0, 192):

		if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 0))

			fw_name = FIRMWARE_SIENNA_CICHLID;

		else

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

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ struct amdgpu_vcn { 


	uint8_t	num_vcn_inst;

	struct amdgpu_vcn_inst	 inst[AMDGPU_MAX_VCN_INSTANCES];

	uint8_t			 sriov_config[AMDGPU_MAX_VCN_INSTANCES];

	struct amdgpu_vcn_reg	 internal;

	struct mutex		 vcn_pg_lock;

	struct mutex		vcn1_jpeg1_workaround;

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

+0 −2
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ static int nv_query_video_codecs(struct amdgpu_device *adev, bool encode, 
{

	switch (adev->ip_versions[UVD_HWIP][0]) {

	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

	case IP_VERSION(3, 0, 192):

		if (amdgpu_sriov_vf(adev)) {

			if (encode)

				*codecs = &sriov_sc_video_codecs_encode;