This initializes VPE IP version 2.2.0
Signed-off-by: Caden Chien <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 1 +
drivers/gpu/drm/amd/amdgpu/vpe_v2_0.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 8e3b6a4050e9..9d95a4f915f9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2740,6 +2740,7 @@ static int amdgpu_discovery_set_vpe_ip_blocks(struct
amdgpu_device *adev)
amdgpu_device_ip_block_add(adev, &vpe_v6_1_ip_block);
break;
case IP_VERSION(2, 0, 0):
+ case IP_VERSION(2, 2, 0):
amdgpu_device_ip_block_add(adev, &vpe_v2_0_ip_block);
break;
default:
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
index 601420491477..7bf74ff93fbd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
@@ -312,6 +312,7 @@ static int vpe_early_init(struct amdgpu_ip_block *ip_block)
vpe->collaborate_mode = true;
break;
case IP_VERSION(2, 0, 0):
+ case IP_VERSION(2, 2, 0):
vpe_v2_0_set_funcs(vpe);
break;
default:
diff --git a/drivers/gpu/drm/amd/amdgpu/vpe_v2_0.c
b/drivers/gpu/drm/amd/amdgpu/vpe_v2_0.c
index 0d91e01fbf3a..c92c5fc59aeb 100644
--- a/drivers/gpu/drm/amd/amdgpu/vpe_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vpe_v2_0.c
@@ -31,6 +31,7 @@
#include "vpe/vpe_2_0_0_sh_mask.h"
MODULE_FIRMWARE("amdgpu/vpe_2_0_0.bin");
+MODULE_FIRMWARE("amdgpu/vpe_2_2_0.bin");
#define VPE_THREAD1_UCODE_OFFSET 0x8000
--
2.53.0
