From: Caden Chien Date: Mon, 18 May 2026 05:22:23 +0000 (+0800) Subject: drm/amdgpu/vpe: add vpe v2.2.0 support X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=66ce596a061ccd226f8cf3614accd753a9982274;p=thirdparty%2Flinux.git drm/amdgpu/vpe: add vpe v2.2.0 support This initializes VPE IP version 2.2.0 Signed-off-by: Caden Chien Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c index bc0dba2ed4503..be5069642a907 100644 --- 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 6014204914774..7bf74ff93fbdb 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 0d91e01fbf3a2..c92c5fc59aeb9 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