Signed-off-by: Piotr Redlewski <predlewski at gmail.com> --- drivers/gpu/drm/amd/amdgpu/Makefile | 3 ++- drivers/gpu/drm/amd/amdgpu/si.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 6a025c476b37..5c1bae35d2aa 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -38,7 +38,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \ ci_smc.o ci_dpm.o dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o \ amdgpu_amdkfd_gfx_v7.o -amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o +amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o \ + dce_v6_0.o si_dpm.o si_smc.o uvd_v4_0.o amdgpu-y += \ vi.o mxgpu_vi.o nbio_v6_1.o soc15.o mxgpu_ai.o nbio_v7_0.o diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index bc6fd1ff4f86..0e0445602215 100644 --- a/drivers/gpu/drm/amd/amdgpu/si.c +++ b/drivers/gpu/drm/amd/amdgpu/si.c @@ -38,6 +38,7 @@ #include "gmc_v6_0.h" #include "si_dma.h" #include "dce_v6_0.h" +#include "uvd_v4_0.h" #include "si.h" #include "dce_virtual.h" #include "gca/gfx_6_0_d.h" @@ -2214,7 +2215,7 @@ int si_set_ip_blocks(struct amdgpu_device *adev) amdgpu_ip_block_add(adev, &dce_v6_0_ip_block); amdgpu_ip_block_add(adev, &gfx_v6_0_ip_block); amdgpu_ip_block_add(adev, &si_dma_ip_block); - /* amdgpu_ip_block_add(adev, &uvd_v3_1_ip_block); */ + amdgpu_ip_block_add(adev, &uvd_v4_0_ip_block); /* amdgpu_ip_block_add(adev, &vce_v1_0_ip_block); */ break; case CHIP_OLAND: @@ -2228,7 +2229,7 @@ int si_set_ip_blocks(struct amdgpu_device *adev) amdgpu_ip_block_add(adev, &dce_v6_4_ip_block); amdgpu_ip_block_add(adev, &gfx_v6_0_ip_block); amdgpu_ip_block_add(adev, &si_dma_ip_block); - /* amdgpu_ip_block_add(adev, &uvd_v3_1_ip_block); */ + amdgpu_ip_block_add(adev, &uvd_v4_0_ip_block); /* amdgpu_ip_block_add(adev, &vce_v1_0_ip_block); */ break; case CHIP_HAINAN: -- 2.15.0
