aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amdfalconx86/recipes-kernel/linux/files/0001-fix-hang-issue-when-enable-CONFIG_DRM_AMD_ACP.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/files/0001-fix-hang-issue-when-enable-CONFIG_DRM_AMD_ACP.patch')
-rw-r--r--meta-amdfalconx86/recipes-kernel/linux/files/0001-fix-hang-issue-when-enable-CONFIG_DRM_AMD_ACP.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/0001-fix-hang-issue-when-enable-CONFIG_DRM_AMD_ACP.patch b/meta-amdfalconx86/recipes-kernel/linux/files/0001-fix-hang-issue-when-enable-CONFIG_DRM_AMD_ACP.patch
deleted file mode 100644
index 5d66128d..00000000
--- a/meta-amdfalconx86/recipes-kernel/linux/files/0001-fix-hang-issue-when-enable-CONFIG_DRM_AMD_ACP.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0425f76fdb78fcede5819426814748912804eaa0 Mon Sep 17 00:00:00 2001
-From: Xiaogang <xiaogang.chen@amd.com>
-Date: Wed, 20 Jul 2016 11:48:13 -0500
-Subject: [PATCH] fix hang issue when enable CONFIG_DRM_AMD_ACP
-
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
- mode change 100644 => 100755 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-old mode 100644
-new mode 100755
-index d6b0bff..34491f8
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
-@@ -84,7 +84,6 @@ static int acp_sw_init(void *handle)
- struct amdgpu_device *adev = (struct amdgpu_device *)handle;
-
- adev->acp.parent = adev->dev;
--
- adev->acp.cgs_device =
- amdgpu_cgs_create_device(adev);
- if (!adev->acp.cgs_device)
-@@ -356,20 +355,27 @@ static int acp_hw_init(void *handle)
- adev->acp.acp_cell[0].num_resources = 4;
- adev->acp.acp_cell[0].resources = &adev->acp.acp_res[0];
-
-+ adev->acp.acp_cell[0].ignore_resource_conflicts = 1;
-+
- adev->acp.acp_cell[1].name = "designware-i2s";
- adev->acp.acp_cell[1].num_resources = 1;
- adev->acp.acp_cell[1].resources = &adev->acp.acp_res[1];
- adev->acp.acp_cell[1].platform_data = &i2s_pdata[0];
- adev->acp.acp_cell[1].pdata_size = sizeof(struct i2s_platform_data);
-
-+ adev->acp.acp_cell[1].ignore_resource_conflicts = 1;
-+
- adev->acp.acp_cell[2].name = "designware-i2s";
- adev->acp.acp_cell[2].num_resources = 1;
- adev->acp.acp_cell[2].resources = &adev->acp.acp_res[2];
- adev->acp.acp_cell[2].platform_data = &i2s_pdata[1];
- adev->acp.acp_cell[2].pdata_size = sizeof(struct i2s_platform_data);
-
-+ adev->acp.acp_cell[2].ignore_resource_conflicts = 1;
-+
- r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell,
- ACP_DEVS);
-+
- if (r)
- return r;
-
---
-2.1.4
-