Commit afc2f276 authored by Boyuan Zhang's avatar Boyuan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu/vcn: add vcn support for vcn 3.1.2 



Load VCN FW, set caps.

Signed-off-by: default avatarBoyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 93afe158

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

+1 −0
Original line number Diff line number Diff line
@@ -1528,6 +1528,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
		case IP_VERSION(3, 0, 0):

		case IP_VERSION(3, 0, 16):

		case IP_VERSION(3, 1, 1):

		case IP_VERSION(3, 1, 2):

		case IP_VERSION(3, 0, 2):

		case IP_VERSION(3, 0, 192):

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

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

+8 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#define FIRMWARE_ALDEBARAN	"amdgpu/aldebaran_vcn.bin"

#define FIRMWARE_BEIGE_GOBY	"amdgpu/beige_goby_vcn.bin"

#define FIRMWARE_YELLOW_CARP	"amdgpu/yellow_carp_vcn.bin"

#define FIRMWARE_VCN_3_1_2	"amdgpu/vcn_3_1_2_vcn.bin"



MODULE_FIRMWARE(FIRMWARE_RAVEN);

MODULE_FIRMWARE(FIRMWARE_PICASSO);
@@ -68,6 +69,7 @@ MODULE_FIRMWARE(FIRMWARE_VANGOGH); 
MODULE_FIRMWARE(FIRMWARE_DIMGREY_CAVEFISH);

MODULE_FIRMWARE(FIRMWARE_BEIGE_GOBY);

MODULE_FIRMWARE(FIRMWARE_YELLOW_CARP);

MODULE_FIRMWARE(FIRMWARE_VCN_3_1_2);



static void amdgpu_vcn_idle_work_handler(struct work_struct *work);
@@ -165,6 +167,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 1, 2):

		fw_name = FIRMWARE_VCN_3_1_2;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	default:

		return -EINVAL;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ static int nv_query_video_codecs(struct amdgpu_device *adev, bool encode, 
			*codecs = &sc_video_codecs_decode;

		return 0;

	case IP_VERSION(3, 1, 1):

	case IP_VERSION(3, 1, 2):

		if (encode)

			*codecs = &nv_video_codecs_encode;

		else