]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drm/amdgpu/cik: don't mess with aspm if gpu is root bus
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 4 Feb 2016 15:33:59 +0000 (10:33 -0500)
committerTim Gardner <tim.gardner@canonical.com>
Wed, 6 Apr 2016 09:25:56 +0000 (10:25 +0100)
BugLink: http://bugs.launchpad.net/bugs/1546572
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>
(cherry picked from commit 76ecb2c75bc772050f2e0462b9cf0163cc43046e)
Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/gpu/drm/amd/amdgpu/cik.c

index fd9c9588ef46335d7a154e664bce8275d62f3ae9..5c978e064f47f6b59e592a800ae9298b36ef2075 100644 (file)
@@ -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;