RE: linux-next: build failure after merge of the final tree (drm tree related)

2013-09-02 Thread Deucher, Alexander 


> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Monday, September 02, 2013 5:01 AM
> To: Dave Airlie
> Cc: linux-n...@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 
> Date: Mon, 2 Sep 2013 18:57:41 +1000
> Subject: [PATCH] drm/radeon: protect ACPI calls with CONFIG_ACPI
> 
> Signed-off-by: Stephen Rothwell 

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 Rothwells...@canb.auug.org.au

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

RE: linux-next: build failure after merge of the final tree (drm tree related)

2013-09-02 Thread Deucher, Alexander 


 -Original Message-
 From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
 Sent: Monday, September 02, 2013 5:01 AM
 To: Dave Airlie
 Cc: linux-n...@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 s...@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 s...@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 Rothwells...@canb.auug.org.au

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the final tree (drm tree related)

2013-02-21 Thread Rob Clark 
Hmm, maybe DRM_GEM_CMA_HELPER should depend on ARM (or !PPC)?  Or
maybe there is an alternative fxn to use on other archs?

In truth, it is fine to make TILCDC depend on ARM, as it wouldn't be
used on any other platform (today.. until TI comes up with some crazy
chip w/ some TI DSP plus display controller), although that doesn't
quite feel like the right fix.  It would be nice to make the CMA
helpers do the right thing on other archs somehow.

BR,
-R

On Thu, Feb 21, 2013 at 11:17 PM, Stephen Rothwell  
wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_buf_destroy':
> drivers/gpu/drm/drm_gem_cma_helper.c:38:2: error: implicit declaration of 
> function 'dma_free_writecombine' [-Werror=implicit-function-declaration]
> drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_create':
> drivers/gpu/drm/drm_gem_cma_helper.c:61:2: error: implicit declaration of 
> function 'dma_alloc_writecombine' [-Werror=implicit-function-declaration]
>
> Probably caused by commit 16ea975eac67 ("drm/tilcdc: add TI LCD
> Controller DRM driver (v4)") which forced CONFIG_DRM_GEM_CMA_HELPER to
> 'y'.  dma_alloc/free_writecombine are only defined on ARM.
>
> I added this patch for today.
>
> From: Stephen Rothwell 
> Date: Fri, 22 Feb 2013 15:14:50 +1100
> Subject: [PATCH] drm/tilcdc: only build on arm
>
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/gpu/drm/tilcdc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig
> index ae14fd6..d24d040 100644
> --- a/drivers/gpu/drm/tilcdc/Kconfig
> +++ b/drivers/gpu/drm/tilcdc/Kconfig
> @@ -1,6 +1,6 @@
>  config DRM_TILCDC
> tristate "DRM Support for TI LCDC Display Controller"
> -   depends on DRM && OF
> +   depends on DRM && OF && ARM
> select DRM_KMS_HELPER
> select DRM_KMS_CMA_HELPER
> select DRM_GEM_CMA_HELPER
> --
> 1.8.1
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the final tree (drm tree related)

2013-02-21 Thread Rob Clark 
Hmm, maybe DRM_GEM_CMA_HELPER should depend on ARM (or !PPC)?  Or
maybe there is an alternative fxn to use on other archs?

In truth, it is fine to make TILCDC depend on ARM, as it wouldn't be
used on any other platform (today.. until TI comes up with some crazy
chip w/ some TI DSP plus display controller), although that doesn't
quite feel like the right fix.  It would be nice to make the CMA
helpers do the right thing on other archs somehow.

BR,
-R

On Thu, Feb 21, 2013 at 11:17 PM, Stephen Rothwell s...@canb.auug.org.au 
wrote:
 Hi all,

 After merging the final tree, today's linux-next build (powerpc
 allyesconfig) failed like this:

 drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_buf_destroy':
 drivers/gpu/drm/drm_gem_cma_helper.c:38:2: error: implicit declaration of 
 function 'dma_free_writecombine' [-Werror=implicit-function-declaration]
 drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_create':
 drivers/gpu/drm/drm_gem_cma_helper.c:61:2: error: implicit declaration of 
 function 'dma_alloc_writecombine' [-Werror=implicit-function-declaration]

 Probably caused by commit 16ea975eac67 (drm/tilcdc: add TI LCD
 Controller DRM driver (v4)) which forced CONFIG_DRM_GEM_CMA_HELPER to
 'y'.  dma_alloc/free_writecombine are only defined on ARM.

 I added this patch for today.

 From: Stephen Rothwell s...@canb.auug.org.au
 Date: Fri, 22 Feb 2013 15:14:50 +1100
 Subject: [PATCH] drm/tilcdc: only build on arm

 Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
 ---
  drivers/gpu/drm/tilcdc/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig
 index ae14fd6..d24d040 100644
 --- a/drivers/gpu/drm/tilcdc/Kconfig
 +++ b/drivers/gpu/drm/tilcdc/Kconfig
 @@ -1,6 +1,6 @@
  config DRM_TILCDC
 tristate DRM Support for TI LCDC Display Controller
 -   depends on DRM  OF
 +   depends on DRM  OF  ARM
 select DRM_KMS_HELPER
 select DRM_KMS_CMA_HELPER
 select DRM_GEM_CMA_HELPER
 --
 1.8.1

 --
 Cheers,
 Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/