aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0189-drm-amdgpu-cik-don-t-mess-with-aspm-if-gpu-is-root-b.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0189-drm-amdgpu-cik-don-t-mess-with-aspm-if-gpu-is-root-b.patch')
-rw-r--r--common/recipes-kernel/linux/files/0189-drm-amdgpu-cik-don-t-mess-with-aspm-if-gpu-is-root-b.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0189-drm-amdgpu-cik-don-t-mess-with-aspm-if-gpu-is-root-b.patch b/common/recipes-kernel/linux/files/0189-drm-amdgpu-cik-don-t-mess-with-aspm-if-gpu-is-root-b.patch
new file mode 100644
index 00000000..01598394
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0189-drm-amdgpu-cik-don-t-mess-with-aspm-if-gpu-is-root-b.patch
@@ -0,0 +1,32 @@
+From 72d172fab54a89dab463cdab4decf3aa244cabb8 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Thu, 4 Feb 2016 10:33:59 -0500
+Subject: [PATCH 0189/1110] drm/amdgpu/cik: don't mess with aspm if gpu is root
+ bus
+
+Pcie registers may not be available in a virtualized
+environment.
+
+Reviewed-by: monk liu <monk.liu@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/cik.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
+index fd9c958..5c978e0 100644
+--- a/drivers/gpu/drm/amd/amdgpu/cik.c
++++ b/drivers/gpu/drm/amd/amdgpu/cik.c
+@@ -1762,6 +1762,9 @@ static void cik_program_aspm(struct amdgpu_device *adev)
+ if (amdgpu_aspm == 0)
+ return;
+
++ if (pci_is_root_bus(adev->pdev->bus))
++ return;
++
+ /* XXX double check APUs */
+ if (adev->flags & AMD_IS_APU)
+ return;
+--
+2.7.4
+