diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2660-drm-amdgpu-Enable-VCN-on-navi14.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2660-drm-amdgpu-Enable-VCN-on-navi14.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2660-drm-amdgpu-Enable-VCN-on-navi14.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2660-drm-amdgpu-Enable-VCN-on-navi14.patch new file mode 100644 index 00000000..5cca8ba9 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2660-drm-amdgpu-Enable-VCN-on-navi14.patch @@ -0,0 +1,58 @@ +From f3e2a795840f0abbf4d3ee47e82dc857d4536ba1 Mon Sep 17 00:00:00 2001 +From: James Zhu <James.Zhu@amd.com> +Date: Fri, 1 Mar 2019 16:23:55 -0500 +Subject: [PATCH 2660/2940] drm/amdgpu: Enable VCN on navi14 + +Add navi14 vcn firmware, and enable VCN on navi14. + +Signed-off-by: James Zhu <James.Zhu@amd.com> +Reviewed-by: Leo Liu <leo.liu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 5 +++++ + drivers/gpu/drm/amd/amdgpu/nv.c | 1 + + 2 files changed, 6 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +index c604f1504d3e..f3aaf5531c0e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +@@ -46,11 +46,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); + +@@ -79,6 +81,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; + } +diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c +index a815aadd40b2..3452fc10bc94 100644 +--- a/drivers/gpu/drm/amd/amdgpu/nv.c ++++ b/drivers/gpu/drm/amd/amdgpu/nv.c +@@ -375,6 +375,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; +-- +2.17.1 + |