aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/5295-drm-amdgpu-soc15-clean-up-picasso-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5295-drm-amdgpu-soc15-clean-up-picasso-support.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/5295-drm-amdgpu-soc15-clean-up-picasso-support.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5295-drm-amdgpu-soc15-clean-up-picasso-support.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5295-drm-amdgpu-soc15-clean-up-picasso-support.patch
new file mode 100644
index 00000000..dfc19c99
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5295-drm-amdgpu-soc15-clean-up-picasso-support.patch
@@ -0,0 +1,44 @@
+From 143900bfbbcd185e6a546cf1bc6af879307ee06d Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 13 Sep 2018 15:05:22 -0500
+Subject: [PATCH 5295/5725] drm/amdgpu/soc15: clean up picasso support
+
+It's the same as raven so remove the duplicate case.
+
+Acked-by: Huang Rui <ray.huang@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
+index f5a44d1..f930e09 100644
+--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
+@@ -546,23 +546,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
+ amdgpu_device_ip_block_add(adev, &vce_v4_0_ip_block);
+ break;
+ case CHIP_RAVEN:
+- amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
+- amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
+- amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block);
+- amdgpu_device_ip_block_add(adev, &psp_v10_0_ip_block);
+- amdgpu_device_ip_block_add(adev, &pp_smu_ip_block);
+- if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
+- amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
+-#if defined(CONFIG_DRM_AMD_DC)
+- else if (amdgpu_device_has_dc_support(adev))
+- amdgpu_device_ip_block_add(adev, &dm_ip_block);
+-#else
+-# warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
+-#endif
+- amdgpu_device_ip_block_add(adev, &gfx_v9_0_ip_block);
+- amdgpu_device_ip_block_add(adev, &sdma_v4_0_ip_block);
+- amdgpu_device_ip_block_add(adev, &vcn_v1_0_ip_block);
+- break;
+ case CHIP_PICASSO:
+ amdgpu_device_ip_block_add(adev, &vega10_common_ip_block);
+ amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block);
+--
+2.7.4
+