Commit 2b53b366 authored by Veerabadhran Gopalakrishnan's avatar Veerabadhran Gopalakrishnan Committed by Alex Deucher
Browse files

drm/amdgpu/vcn: Enable VCN 4.0.6 Support 



Modified driver to use the appropriate FW files and instance.

v2: squash in fixes (Alex)

Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarVeerabadhran Gopalakrishnan <veerabadhran.gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 07cb7fd0

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

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#define FIRMWARE_VCN4_0_3		"amdgpu/vcn_4_0_3.bin"

#define FIRMWARE_VCN4_0_4		"amdgpu/vcn_4_0_4.bin"

#define FIRMWARE_VCN4_0_5		"amdgpu/vcn_4_0_5.bin"

#define FIRMWARE_VCN4_0_6		"amdgpu/vcn_4_0_6.bin"

#define FIRMWARE_VCN5_0_0		"amdgpu/vcn_5_0_0.bin"



MODULE_FIRMWARE(FIRMWARE_RAVEN);
@@ -83,6 +84,7 @@ MODULE_FIRMWARE(FIRMWARE_VCN4_0_2); 
MODULE_FIRMWARE(FIRMWARE_VCN4_0_3);

MODULE_FIRMWARE(FIRMWARE_VCN4_0_4);

MODULE_FIRMWARE(FIRMWARE_VCN4_0_5);

MODULE_FIRMWARE(FIRMWARE_VCN4_0_6);

MODULE_FIRMWARE(FIRMWARE_VCN5_0_0);



static void amdgpu_vcn_idle_work_handler(struct work_struct *work);

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

+3 −0
Original line number Diff line number Diff line
@@ -1684,6 +1684,9 @@ static int vcn_v4_0_5_process_interrupt(struct amdgpu_device *adev, struct amdgp 
	case SOC15_IH_CLIENTID_VCN:

		ip_instance = 0;

		break;

	case SOC15_IH_CLIENTID_VCN1:

		ip_instance = 1;

		break;

	default:

		DRM_ERROR("Unhandled client id: %d\n", entry->client_id);

		return 0;