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

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

[Stephen Rothwell]

Hi Dave,

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

drivers/gpu/drm/radeon/radeon_device.c: In function 'radeon_device_init':
drivers/gpu/drm/radeon/radeon_device.c:783: error: too many arguments to function 'vga_switcheroo_register_client'

The i386 defconfig build also failed like this:

drivers/gpu/drm/i915/i915_dma.c: In function 'i915_load_modeset_init':
drivers/gpu/drm/i915/i915_dma.c:1239: error: too many arguments to function 'vga_switcheroo_register_client'

Caused by commit 8d608aa6295242fe4c4b6105b8c59c6a5b232d89
("vga_switcheroo: add reprobe hook for fbcon to recheck connected
outputs") which forgot to update the prototype of
vga_switcheroo_register_client() for the non CONFIG_VGA_SWITCHEROO case.

I applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Jan 2011 15:58:44 +1100
Subject: [PATCH] vga_switcheroo: fix prototype for non CONFIG_VGA_SWITCHEROO build

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/vga_switcheroo.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
index f80fa9d..4b9a7f5 100644
--- a/include/linux/vga_switcheroo.h
+++ b/include/linux/vga_switcheroo.h
@@ -49,6 +49,7 @@ int vga_switcheroo_process_delayed_switch(void);
 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
 static inline int vga_switcheroo_register_client(struct pci_dev *dev,
 					  void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state),
+					  void (*reprobe)(struct pci_dev *dev),
 					  bool (*can_switch)(struct pci_dev *dev)) { return 0; }
 static inline void vga_switcheroo_client_fb_set(struct pci_dev *dev, struct fb_info *info) {}
 static inline int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler) { return 0; }
-- 
1.7.2.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

[Dave Airlie]

> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/radeon/radeon_device.c: In function 'radeon_device_init':
> drivers/gpu/drm/radeon/radeon_device.c:783: error: too many arguments to function 'vga_switcheroo_register_client'

Thanks, noticed it myself this morning, fixed pushed to my tree so should 
be good tomorrow.

Dave.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1712 bytes --]

Hi Dave,

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

drivers/gpu/drm/radeon/radeon_fb.c: In function 'radeonfb_create_pinned_object':
drivers/gpu/drm/radeon/radeon_fb.c:144:18: error: 'struct drm_mode_fb_cmd2' has no member named 'bpp'

Caused by commit 308e5bcbdb10 ("drm: add an fb creation ioctl that takes
a pixel format v5").

I applied this (maybe incorrect) patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Nov 2011 15:11:10 +1100
Subject: [PATCH] drm: fix up for BIG ENDIAN breakage

Commit 308e5bcbdb10 ("drm: add an fb creation ioctl that takes a pixel
format v5") missed one spot needing to be fixed up in the __BIG_ENDIAN
case.

Fixes build error:

drivers/gpu/drm/radeon/radeon_fb.c: In function 'radeonfb_create_pinned_object':
drivers/gpu/drm/radeon/radeon_fb.c:144:18: error: 'struct drm_mode_fb_cmd2' has no member named 'bpp'

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/radeon/radeon_fb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index ea110ad..9c42c6a 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -141,7 +141,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
 		tiling_flags = RADEON_TILING_MACRO;
 
 #ifdef __BIG_ENDIAN
-	switch (mode_cmd->bpp) {
+	switch (bpp) {
 	case 32:
 		tiling_flags |= RADEON_TILING_SWAP_32BIT;
 		break;
-- 
1.7.7.3


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 899 bytes --]

Hi Dave,

On Tue, 29 Nov 2011 15:16:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 29 Nov 2011 15:11:10 +1100
> Subject: [PATCH] drm: fix up for BIG ENDIAN breakage
> 
> Commit 308e5bcbdb10 ("drm: add an fb creation ioctl that takes a pixel
> format v5") missed one spot needing to be fixed up in the __BIG_ENDIAN
> case.
> 
> Fixes build error:
> 
> drivers/gpu/drm/radeon/radeon_fb.c: In function 'radeonfb_create_pinned_object':
> drivers/gpu/drm/radeon/radeon_fb.c:144:18: error: 'struct drm_mode_fb_cmd2' has no member named 'bpp'
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Not a biggie, but I noticed that when you added this patch to your tree
you lost the authorship ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[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 <sfr@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 <sfr@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 <sfr@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 Rothwell                    sfr@canb.auug.org.au

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2535 bytes --]

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>
---
 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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Deucher, Alexander]

> -----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