lkml.org 
[lkml]   [2013]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRE: linux-next: build failure after merge of the final tree (drm tree related)
Date


> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Monday, September 02, 2013 5:01 AM
> To: Dave Airlie
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Deucher,
> Alexander
> Subject: linux-next: build failure after merge of the final tree (drm tree
> related)
>
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/gpu/drm/radeon/ci_dpm.c: In function
> 'ci_request_link_speed_change_before_state_change':
> drivers/gpu/drm/radeon/ci_dpm.c:4212:4: error: implicit declaration of
> function 'radeon_acpi_pcie_performance_request' [-Werror=implicit-
> function-declaration]
> if (radeon_acpi_pcie_performance_request(rdev,
> PCIE_PERF_REQ_PECI_GEN3, false) == 0)
> ^
>
> Caused by commit cc8dbbb4f62a ("drm/radeon: add dpm support for CI
> dGPUs
> (v2)"). These calls need protecting with CONFIG_ACPI (like is done in
> cypress_dpm.c, I guess).
>
> I tried reverting commit 9c725e5bcdae ("Merge branch 'drm-next-3.12' of
> git://people.freedesktop.org/~agd5f/linux into drm-next") but that failed
> because that branch is based on v3.11-rc7 (!) which is later than the
> base of the drm tree (v3.11-rc3). :-(
>
> I added this fix up patch for today (it may be wrong, butfixes the build
> failure).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 Sep 2013 18:57:41 +1000
> Subject: [PATCH] drm/radeon: protect ACPI calls with CONFIG_ACPI
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

The patch looks fine.

Thanks,

Alex

> ---
> drivers/gpu/drm/radeon/ci_dpm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/ci_dpm.c
> b/drivers/gpu/drm/radeon/ci_dpm.c
> index 916630f..3cce533 100644
> --- a/drivers/gpu/drm/radeon/ci_dpm.c
> +++ b/drivers/gpu/drm/radeon/ci_dpm.c
> @@ -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
> }
> }
>
> --
> 1.8.4.rc3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au



\
 
 \ /
  Last update: 2013-09-02 17:21    [W:0.082 / U:24.344 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site