Commit e149a2f6 authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Enable VCN on navi14 



Add navi14 vcn firmware, and enable VCN on navi14.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent baebcf2e

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

+5 −0
Original line number Diff line number Diff line
@@ -47,11 +47,13 @@ 
#define FIRMWARE_PICASSO	"amdgpu/picasso_vcn.bin"

#define FIRMWARE_RAVEN2		"amdgpu/raven2_vcn.bin"

#define FIRMWARE_NAVI10 	"amdgpu/navi10_vcn.bin"

#define FIRMWARE_NAVI14 	"amdgpu/navi14_vcn.bin"



MODULE_FIRMWARE(FIRMWARE_RAVEN);

MODULE_FIRMWARE(FIRMWARE_PICASSO);

MODULE_FIRMWARE(FIRMWARE_RAVEN2);

MODULE_FIRMWARE(FIRMWARE_NAVI10);

MODULE_FIRMWARE(FIRMWARE_NAVI14);



static void amdgpu_vcn_idle_work_handler(struct work_struct *work);
@@ -80,6 +82,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

    case CHIP_NAVI14:

		fw_name = FIRMWARE_NAVI14;

		break;

	default:

		return -EINVAL;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
			amdgpu_device_ip_block_add(adev, &dm_ip_block);

		amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);

		amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block);

		amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);

		break;

	default:

		return -EINVAL;