drm/amdgpu/vpe: add vpe v2.2.0 support

This initializes VPE IP version 2.2.0

Signed-off-by: Caden Chien <chih-wei.chien@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index bc0dba2ed45039b6b78f9972d914c064bc9fffc9..be5069642a9076bb067dd051d66e1030d463f160 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2769,6 +2769,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 60142049147744cf8b5b738d800ad38090ef0a50..7bf74ff93fbdb11b17aeb6998e1ae9d6e8aad018 100644 (file)
--- 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 0d91e01fbf3a2debcf4084d3112f48c5f5234b5f..c92c5fc59aeb96daf3b207010e9d9e27dc0d7ad7 100644 (file)
--- 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