From: Caden Chien <[email protected]> This initializes VPE IP version 3.0.1
Signed-off-by: Caden Chien <[email protected]> Signed-off-by: Alex Deucher <[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_v3_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 dfa6081ac89b1..a8d296d5b884e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c @@ -3348,6 +3348,7 @@ static int amdgpu_discovery_set_vpe_ip_blocks(struct amdgpu_device *adev) amdgpu_device_ip_block_add(adev, &vpe_v2_0_ip_block); break; case IP_VERSION(3, 0, 0): + case IP_VERSION(3, 0, 1): amdgpu_device_ip_block_add(adev, &vpe_v3_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 792dca283109e..39bf218b6f7cd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c @@ -317,6 +317,7 @@ static int vpe_early_init(struct amdgpu_ip_block *ip_block) vpe_v2_0_set_funcs(vpe); break; case IP_VERSION(3, 0, 0): + case IP_VERSION(3, 0, 1): vpe_v3_0_set_funcs(vpe); break; default: diff --git a/drivers/gpu/drm/amd/amdgpu/vpe_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vpe_v3_0.c index 4af009d469401..9077ae138d2a3 100644 --- a/drivers/gpu/drm/amd/amdgpu/vpe_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vpe_v3_0.c @@ -31,6 +31,7 @@ #include "vpe/vpe_3_0_0_sh_mask.h" MODULE_FIRMWARE("amdgpu/vpe_3_0_0.bin"); +MODULE_FIRMWARE("amdgpu/vpe_3_0_1.bin"); #define VPE_THREAD1_UCODE_OFFSET 0x8000 -- 2.55.0
