diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2672-drm-amdgpu-consolidate-navi14-IP-init.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2672-drm-amdgpu-consolidate-navi14-IP-init.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2672-drm-amdgpu-consolidate-navi14-IP-init.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2672-drm-amdgpu-consolidate-navi14-IP-init.patch new file mode 100644 index 00000000..fb43190f --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2672-drm-amdgpu-consolidate-navi14-IP-init.patch @@ -0,0 +1,49 @@ +From be3faffdc92cd402d1507ede4353cdf9388b4a09 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Tue, 2 Jul 2019 14:42:25 -0500 +Subject: [PATCH 2672/2940] drm/amdgpu: consolidate navi14 IP init + +It's the same as navi10. + +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/nv.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c +index 9e21e223e7bb..476080e389fc 100644 +--- a/drivers/gpu/drm/amd/amdgpu/nv.c ++++ b/drivers/gpu/drm/amd/amdgpu/nv.c +@@ -342,6 +342,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) + + switch (adev->asic_type) { + case CHIP_NAVI10: ++ case CHIP_NAVI14: + amdgpu_device_ip_block_add(adev, &nv_common_ip_block); + amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block); + amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block); +@@ -362,21 +363,6 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) + if (adev->enable_mes) + amdgpu_device_ip_block_add(adev, &mes_v10_1_ip_block); + break; +- case CHIP_NAVI14: +- amdgpu_device_ip_block_add(adev, &nv_common_ip_block); +- amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block); +- amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block); +- amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block); +- if (is_support_sw_smu(adev)) +- amdgpu_device_ip_block_add(adev, &smu_v11_0_ip_block); +- if (adev->enable_virtual_display || amdgpu_sriov_vf(adev)) +- amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block); +- else if (amdgpu_device_has_dc_support(adev)) +- amdgpu_device_ip_block_add(adev, &dm_ip_block); +- amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block); +- amdgpu_device_ip_block_add(adev, &sdma_v5_0_ip_block); +- amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block); +- break; + default: + return -EINVAL; + } +-- +2.17.1 + |