]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/radeon: protect ACPI calls with CONFIG_ACPI
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Sep 2013 09:01:23 +0000 (19:01 +1000)
committerDave Airlie <airlied@gmail.com>
Wed, 4 Sep 2013 22:19:31 +0000 (08:19 +1000)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Alex Deucher <Alexander.Deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
drivers/gpu/drm/radeon/ci_dpm.c

index 916630fdc7968b64e97a37d70f5c9e62d89dd826..3cce533397c6583e345bd27cc79bd6b725926097 100644 (file)
@@ -4208,6 +4208,7 @@ static void ci_request_link_speed_change_before_state_change(struct radeon_devic
        pi->pspp_notify_required = false;
        if (target_link_speed > current_link_speed) {
                switch (target_link_speed) {
+#ifdef CONFIG_ACPI
                case RADEON_PCIE_GEN3:
                        if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN3, false) == 0)
                                break;
@@ -4217,6 +4218,7 @@ static void ci_request_link_speed_change_before_state_change(struct radeon_devic
                case RADEON_PCIE_GEN2:
                        if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN2, false) == 0)
                                break;
+#endif
                default:
                        pi->force_pcie_gen = ci_get_current_pcie_speed(rdev);
                        break;
@@ -4248,7 +4250,9 @@ static void ci_notify_link_speed_change_after_state_change(struct radeon_device
                    (ci_get_current_pcie_speed(rdev) > 0))
                        return;
 
+#ifdef CONFIG_ACPI
                radeon_acpi_pcie_performance_request(rdev, request, false);
+#endif
        }
 }