linux-next: build failure after merge of the drm-misc tree

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/tegra/drm.c: In function 'tegra_atomic_complete':
drivers/gpu/drm/tegra/drm.c:58:2: error: implicit declaration of function 'drm_atomic_helper_commit_pre_planes' [-Werror=implicit-function-declaration]
  drm_atomic_helper_commit_pre_planes(drm, state);
  ^
drivers/gpu/drm/tegra/drm.c:60:2: error: implicit declaration of function 'drm_atomic_helper_commit_post_planes' [-Werror=implicit-function-declaration]
  drm_atomic_helper_commit_post_planes(drm, state);
  ^

Caused by commit ad9e7c89a4e4 ("drm/atomic-helper: Rename
commmit_post/pre_planes") interacting with commit 1503ca47d76e
("drm/tegra: Atomic conversion, phase 3, step 3") from v4.0-rc1.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Feb 2015 11:37:11 +1100
Subject: [PATCH] drm/atomic-helper: fix for Rename commmit_post/pre_planes

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

diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 7dd328d77996..5f1880766110 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -55,9 +55,9 @@ static void tegra_atomic_complete(struct tegra_drm *tegra,
 	 * current layout.
 	 */
 
-	drm_atomic_helper_commit_pre_planes(drm, state);
+	drm_atomic_helper_commit_modeset_disables(drm, state);
 	drm_atomic_helper_commit_planes(drm, state);
-	drm_atomic_helper_commit_post_planes(drm, state);
+	drm_atomic_helper_commit_modeset_enables(drm, state);
 
 	drm_atomic_helper_wait_for_vblanks(drm, state);
 
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Tue, Feb 24, 2015 at 11:41:40AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/tegra/drm.c: In function 'tegra_atomic_complete':
> drivers/gpu/drm/tegra/drm.c:58:2: error: implicit declaration of function 'drm_atomic_helper_commit_pre_planes' [-Werror=implicit-function-declaration]
>   drm_atomic_helper_commit_pre_planes(drm, state);
>   ^
> drivers/gpu/drm/tegra/drm.c:60:2: error: implicit declaration of function 'drm_atomic_helper_commit_post_planes' [-Werror=implicit-function-declaration]
>   drm_atomic_helper_commit_post_planes(drm, state);
>   ^
> 
> Caused by commit ad9e7c89a4e4 ("drm/atomic-helper: Rename
> commmit_post/pre_planes") interacting with commit 1503ca47d76e
> ("drm/tegra: Atomic conversion, phase 3, step 3") from v4.0-rc1.
> 
> I added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 24 Feb 2015 11:37:11 +1100
> Subject: [PATCH] drm/atomic-helper: fix for Rename commmit_post/pre_planes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

I've squashed this into the relevant patch in drm-misc, thanks for
reporting and fixing this.
-Daniel

> ---
>  drivers/gpu/drm/tegra/drm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> index 7dd328d77996..5f1880766110 100644
> --- a/drivers/gpu/drm/tegra/drm.c
> +++ b/drivers/gpu/drm/tegra/drm.c
> @@ -55,9 +55,9 @@ static void tegra_atomic_complete(struct tegra_drm *tegra,
>  	 * current layout.
>  	 */
>  
> -	drm_atomic_helper_commit_pre_planes(drm, state);
> +	drm_atomic_helper_commit_modeset_disables(drm, state);
>  	drm_atomic_helper_commit_planes(drm, state);
> -	drm_atomic_helper_commit_post_planes(drm, state);
> +	drm_atomic_helper_commit_modeset_enables(drm, state);
>  
>  	drm_atomic_helper_wait_for_vblanks(drm, state);
>  
> -- 
> 2.1.4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb':
drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration]
  drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb",
  ^

Caused by commit

  7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions")

I have used the drm-misc tree from next-20150713 for today.

(That commit said "COMPILE TESTED ONLY"  :-()
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Archit Taneja]

Hi,

On 07/14/2015 08:22 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb':
> drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration]
>    drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb",
>    ^
>
> Caused by commit
>
>    7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions")
>
> I have used the drm-misc tree from next-20150713 for today.
>
> (That commit said "COMPILE TESTED ONLY"  :-()

My bad. The commit messages were for a slightly older version.
I'll fix this, and the warnings in the other mail.

Thanks,
Archit


-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Tue, Jul 14, 2015 at 10:30:56AM +0530, Archit Taneja wrote:
> 
> Hi,
> 
> On 07/14/2015 08:22 AM, Stephen Rothwell wrote:
> >Hi all,
> >
> >After merging the drm-misc tree, today's linux-next build (x86_64
> >allmodconfig) failed like this:
> >
> >drivers/gpu/drm/virtio/virtgpu_drm_bus.c: In function 'virtio_pci_kick_out_firmware_fb':
> >drivers/gpu/drm/virtio/virtgpu_drm_bus.c:55:2: error: implicit declaration of function 'drm_fb_helper_remove_conflicting_framebuffers' [-Werror=implicit-function-declaration]
> >   drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb",
> >   ^
> >
> >Caused by commit
> >
> >   7bd870e7b1c8 ("drm/virtio: Use new drm_fb_helper functions")
> >
> >I have used the drm-misc tree from next-20150713 for today.
> >
> >(That commit said "COMPILE TESTED ONLY"  :-()
> 
> My bad. The commit messages were for a slightly older version.
> I'll fix this, and the warnings in the other mail.

Yeah it's a big patch series with a testing chicken-egg problem, so I
figured I'll give it a spin in -next. Dropped again until it works better.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
  struct drm_framebuffer *fb = old_state->fb;
                          ^
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
   struct drm_framebuffer *fb,
                           ^
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
   .cleanup_fb = mdp5_plane_cleanup_fb,
   ^
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')

Caused by commit

  a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")

Well, that was clearly never build tested :-(

I have used the drm-misc tree from next-20150902 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
>   struct drm_framebuffer *fb = old_state->fb;
>                           ^
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
>    struct drm_framebuffer *fb,
>                            ^
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
>    .cleanup_fb = mdp5_plane_cleanup_fb,
>    ^
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
> 
> Caused by commit
> 
>   a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
> 
> Well, that was clearly never build tested :-(
> 
> I have used the drm-misc tree from next-20150902 for today.

This is still in today's linux-next :-(

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Maarten Lankhorst]

Op 08-09-15 om 01:42 schreef Stephen Rothwell:
> Hi all,
>
> On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> After merging the drm-misc tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
>>   struct drm_framebuffer *fb = old_state->fb;
>>                           ^
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
>>    struct drm_framebuffer *fb,
>>                            ^
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
>>    .cleanup_fb = mdp5_plane_cleanup_fb,
>>    ^
>> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
>>
>> Caused by commit
>>
>>   a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
>>
>> Well, that was clearly never build tested :-(
>>
>> I have used the drm-misc tree from next-20150902 for today.
> This is still in today's linux-next :-(
>
I just got around to making an amend fix patch for it yesterday. Can you fold it into v3 daniel?

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index 4d390b699e9a..a0f5ff0ce8dc 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -264,7 +264,6 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,
 }
 
 static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
-		struct drm_framebuffer *fb,
 		const struct drm_plane_state *old_state)
 {
 	struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Tue, Sep 08, 2015 at 06:48:34AM +0200, Maarten Lankhorst wrote:
> Op 08-09-15 om 01:42 schreef Stephen Rothwell:
> > Hi all,
> >
> > On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> After merging the drm-misc tree, today's linux-next build (arm
> >> multi_v7_defconfig) failed like this:
> >>
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: In function 'mdp5_plane_cleanup_fb':
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:272:26: error: 'fb' redeclared as different kind of symbol
> >>   struct drm_framebuffer *fb = old_state->fb;
> >>                           ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:267:27: note: previous definition of 'fb' was here
> >>    struct drm_framebuffer *fb,
> >>                            ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c: At top level:
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: initialization from incompatible pointer type
> >>    .cleanup_fb = mdp5_plane_cleanup_fb,
> >>    ^
> >> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c:383:3: warning: (near initialization for 'mdp5_plane_helper_funcs.cleanup_fb')
> >>
> >> Caused by commit
> >>
> >>   a317290af0db ("drm/atomic: Make prepare_fb/cleanup_fb only take state, v3")
> >>
> >> Well, that was clearly never build tested :-(
> >>
> >> I have used the drm-misc tree from next-20150902 for today.
> > This is still in today's linux-next :-(
> >
> I just got around to making an amend fix patch for it yesterday. Can you fold it into v3 daniel?

Squashed in, thanks.
-Daniel

> 
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> index 4d390b699e9a..a0f5ff0ce8dc 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> @@ -264,7 +264,6 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,
>  }
>  
>  static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
> -		struct drm_framebuffer *fb,
>  		const struct drm_plane_state *old_state)
>  {
>  	struct mdp5_plane *mdp5_plane = to_mdp5_plane(plane);
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "drm_agp_release" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_acquire" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_enable" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_info" [drivers/gpu/drm/radeon/radeon.ko] undefined!
ERROR: "drm_agp_release" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_acquire" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_free" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_bind" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_unbind" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_alloc" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_enable" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_info" [drivers/gpu/drm/mga/mga.ko] undefined!
ERROR: "drm_agp_unbind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_init" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_alloc_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_clear" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_info_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_enable_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_release_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_bind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_acquire_ioctl" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "drm_agp_free_ioctl" [drivers/gpu/drm/drm.ko] undefined!

Not quite sure which commit caused this, but I have used the drm-misc
tree from next-20150930 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Thu, Oct 01, 2015 at 12:47:17PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "drm_agp_release" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_acquire" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_enable" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_info" [drivers/gpu/drm/radeon/radeon.ko] undefined!
> ERROR: "drm_agp_release" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_acquire" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_free" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_bind" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_unbind" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_alloc" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_enable" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_info" [drivers/gpu/drm/mga/mga.ko] undefined!
> ERROR: "drm_agp_unbind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_init" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_alloc_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_clear" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_info_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_enable_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_release_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_bind_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_acquire_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> ERROR: "drm_agp_free_ioctl" [drivers/gpu/drm/drm.ko] undefined!
> 
> Not quite sure which commit caused this, but I have used the drm-misc
> tree from next-20150930 for today.

Build fail for CONFIG_AGP=m (bot not y or n). I'm wrestling kbuild atm.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/i2c/tda998x_drv.c:1354:2: error: unknown field 'save' specified in initializer
  .save = tda998x_encoder_save,
  ^
drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
  .save = tda998x_encoder_save,
          ^
drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: note: (near initialization for 'tda998x_encoder_helper_funcs.mode_fixup')
drivers/gpu/drm/i2c/tda998x_drv.c:1355:2: error: unknown field 'restore' specified in initializer
  .restore = tda998x_encoder_restore,
  ^

Caused by commit

  79f13ad5d8e0 ("drm: Move encoder->save/restore into nouveau")

I have used the drm-misc tree from next-20151207 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
include/linux/apple-gmux.h: In function 'apple_gmux_present':
include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
  return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
                                          ^

Caused by commit

  2413306c2566 ("apple-gmux: Add helper for presence detect")

I have used the drm-misc tree from next-20160209 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> include/linux/apple-gmux.h: In function 'apple_gmux_present':
> include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
>   return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
>                                           ^
> 
> Caused by commit
> 
>   2413306c2566 ("apple-gmux: Add helper for presence detect")
> 
> I have used the drm-misc tree from next-20160209 for today.

Can you pls attach your .config? The function is there, I suspect we're
just missing some depends in Kconfig.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: linux-next: build failure after merge of the drm-misc tree

[Lukas Wunner]

[cc += Rafael J. Wysocki, linux-acpi]

Hi Stephen,

On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> include/linux/apple-gmux.h: In function 'apple_gmux_present':
> include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
>   return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
>                                           ^
> 
> Caused by commit
> 
>   2413306c2566 ("apple-gmux: Add helper for presence detect")
> 
> I have used the drm-misc tree from next-20160209 for today.

Ugh, apologies, I didn't have a non-ACPI platform available to test
this on.

Solution is to either add to include/linux/acpi.h

static inline bool acpi_dev_present(const char *hid)
{
	return false;
}

somewhere below

#else	/* !CONFIG_ACPI */

or alternatively to add to include/linux/apple-gmux.h

IS_ENABLED(CONFIG_ACPI)

in apple_gmux_present().

I'll check the other users of acpi_dev_present() to see which of
these two solutions is more appropriate and will post a fix shortly.

Thanks a lot for reporting this.

Lukas
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Lukas Wunner]

Hi,

On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote:
> On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> > include/linux/apple-gmux.h: In function 'apple_gmux_present':
> > include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> >   return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> >                                           ^
> > 
> > Caused by commit
> > 
> >   2413306c2566 ("apple-gmux: Add helper for presence detect")
> > 
> > I have used the drm-misc tree from next-20160209 for today.
> 
> Ugh, apologies, I didn't have a non-ACPI platform available to test
> this on.
> 
> Solution is to either add to include/linux/acpi.h
> 
> static inline bool acpi_dev_present(const char *hid)
> {
> 	return false;
> }
> 
> somewhere below
> 
> #else	/* !CONFIG_ACPI */
> 
> or alternatively to add to include/linux/apple-gmux.h
> 
> IS_ENABLED(CONFIG_ACPI)
> 
> in apple_gmux_present().
> 
> I'll check the other users of acpi_dev_present() to see which of
> these two solutions is more appropriate and will post a fix shortly.

The patch included below fixes the build if CONFIG_ACPI is not set.

@Daniel Vetter: Would it be possible to squash this with 2413306c2566
("apple-gmux: Add helper for presence detect") on topic/drm-misc so
as to avoid build breakage for anyone trying to bisect between that
commit and this fix?

I checked all other users of acpi_dev_present() and all of them are
only compiled if CONFIG_ACPI is set. Hence I opted to fix this in
<linux/apple-gmux.h> rather than in <linux/acpi.h>.

Thanks again Stephen for reporting this at such an early stage,
though doubtlessly it would have been better if I had thought of
this possibility when preparing the original patch, or if I had
compile-tested without CONFIG_ACPI. :-(

Lukas

-- >8 --
Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI

The DRM drivers i915, nouveau and radeon may be compiled with
CONFIG_ACPI not set, in which case acpi_dev_present() is undefined.

Add a no-op stub for apple_gmux_present() which is used if
CONFIG_APPLE_GMUX is not enabled to avoid build breakage.
(CONFIG_APPLE_GMUX depends on CONFIG_ACPI.)

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
 include/linux/apple-gmux.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
index feebc28..b2d32e0 100644
--- a/include/linux/apple-gmux.h
+++ b/include/linux/apple-gmux.h
@@ -22,6 +22,8 @@
 
 #define GMUX_ACPI_HID "APP000B"
 
+#if IS_ENABLED(CONFIG_APPLE_GMUX)
+
 /**
  * apple_gmux_present() - detect if gmux is built into the machine
  *
@@ -33,7 +35,16 @@
  */
 static inline bool apple_gmux_present(void)
 {
-	return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
+	return acpi_dev_present(GMUX_ACPI_HID);
 }
 
+#else  /* !CONFIG_APPLE_GMUX */
+
+static inline bool apple_gmux_present(void)
+{
+	return false;
+}
+
+#endif /* !CONFIG_APPLE_GMUX */
+
 #endif /* LINUX_APPLE_GMUX_H */
-- 
1.8.5.2 (Apple Git-48)

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Wed, Feb 10, 2016 at 02:17:41PM +0100, Lukas Wunner wrote:
> Hi,
> 
> On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote:
> > On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > After merging the drm-misc tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > > 
> > > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> > > include/linux/apple-gmux.h: In function 'apple_gmux_present':
> > > include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> > >   return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> > >                                           ^
> > > 
> > > Caused by commit
> > > 
> > >   2413306c2566 ("apple-gmux: Add helper for presence detect")
> > > 
> > > I have used the drm-misc tree from next-20160209 for today.
> > 
> > Ugh, apologies, I didn't have a non-ACPI platform available to test
> > this on.
> > 
> > Solution is to either add to include/linux/acpi.h
> > 
> > static inline bool acpi_dev_present(const char *hid)
> > {
> > 	return false;
> > }
> > 
> > somewhere below
> > 
> > #else	/* !CONFIG_ACPI */
> > 
> > or alternatively to add to include/linux/apple-gmux.h
> > 
> > IS_ENABLED(CONFIG_ACPI)
> > 
> > in apple_gmux_present().
> > 
> > I'll check the other users of acpi_dev_present() to see which of
> > these two solutions is more appropriate and will post a fix shortly.
> 
> The patch included below fixes the build if CONFIG_ACPI is not set.
> 
> @Daniel Vetter: Would it be possible to squash this with 2413306c2566
> ("apple-gmux: Add helper for presence detect") on topic/drm-misc so
> as to avoid build breakage for anyone trying to bisect between that
> commit and this fix?
> 
> I checked all other users of acpi_dev_present() and all of them are
> only compiled if CONFIG_ACPI is set. Hence I opted to fix this in
> <linux/apple-gmux.h> rather than in <linux/acpi.h>.
> 
> Thanks again Stephen for reporting this at such an early stage,
> though doubtlessly it would have been better if I had thought of
> this possibility when preparing the original patch, or if I had
> compile-tested without CONFIG_ACPI. :-(

Since !ACPI and enabling APPLE_GMUX is a bit a fringe config I don't think
this will hurt bisectability at all on a real system. So just applied this
one on top of drm-misc.

Thanks, Daniel

> 
> Lukas
> 
> -- >8 --
> Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI
> 
> The DRM drivers i915, nouveau and radeon may be compiled with
> CONFIG_ACPI not set, in which case acpi_dev_present() is undefined.
> 
> Add a no-op stub for apple_gmux_present() which is used if
> CONFIG_APPLE_GMUX is not enabled to avoid build breakage.
> (CONFIG_APPLE_GMUX depends on CONFIG_ACPI.)
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> ---
>  include/linux/apple-gmux.h | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
> index feebc28..b2d32e0 100644
> --- a/include/linux/apple-gmux.h
> +++ b/include/linux/apple-gmux.h
> @@ -22,6 +22,8 @@
>  
>  #define GMUX_ACPI_HID "APP000B"
>  
> +#if IS_ENABLED(CONFIG_APPLE_GMUX)
> +
>  /**
>   * apple_gmux_present() - detect if gmux is built into the machine
>   *
> @@ -33,7 +35,16 @@
>   */
>  static inline bool apple_gmux_present(void)
>  {
> -	return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> +	return acpi_dev_present(GMUX_ACPI_HID);
>  }
>  
> +#else  /* !CONFIG_APPLE_GMUX */
> +
> +static inline bool apple_gmux_present(void)
> +{
> +	return false;
> +}
> +
> +#endif /* !CONFIG_APPLE_GMUX */
> +
>  #endif /* LINUX_APPLE_GMUX_H */
> -- 
> 1.8.5.2 (Apple Git-48)
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/gpu/drm/i915/intel_drv.h:32:0,
                 from drivers/gpu/drm/i915/intel_display.c:36:
drivers/gpu/drm/i915/intel_display.c: In function 'intel_primary_plane_create':
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'
 #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
                                        ^
drivers/gpu/drm/i915/intel_display.c:15077:6: note: in expansion of macro 'INTEL_GEN'
  if (INTEL_GEN(dev) >= 9) {
      ^
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'  
 #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
                                        ^
drivers/gpu/drm/i915/intel_display.c:15081:13: note: in expansion of macro 'INTEL_GEN'
  } else if (INTEL_GEN(dev) >= 4) { 
             ^
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'  
 #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
                                        ^
drivers/gpu/drm/i915/intel_display.c:15088:6: note: in expansion of macro 'INTEL_GEN'
  if (INTEL_GEN(dev) >= 4)
      ^
drivers/gpu/drm/i915/intel_display.c: In function 'intel_cursor_plane_create':
drivers/gpu/drm/i915/i915_drv.h:2601:40: error: 'struct drm_device' has no member named 'info'  
 #define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
                                        ^
drivers/gpu/drm/i915/intel_display.c:15231:6: note: in expansion of macro 'INTEL_GEN'
  if (INTEL_GEN(dev) >= 4)
      ^

Caused by commit

  93ca7e006670 ("drm/i915: Use the per-plane rotation property")

interacting with commit

  55b8f2a76dff ("drm/i915: Make INTEL_GEN only take dev_priv")

from the drm-intel tree.

I added this merge fix patch:

From 3d8024ddc9cd584e23e9ff4845a46475972c3d36 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Oct 2016 11:12:05 +1100
Subject: [PATCH] drm/i915: merge fix for INTEL_GEN API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/intel_display.c | 9 +++++----
 drivers/gpu/drm/i915/intel_sprite.c  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c2a8df968b03..89d73ab020e7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15074,18 +15074,18 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
 	if (ret)
 		goto fail;
 
-	if (INTEL_GEN(dev) >= 9) {
+	if (INTEL_GEN(dev_priv) >= 9) {
 		supported_rotations =
 			DRM_ROTATE_0 | DRM_ROTATE_90 |
 			DRM_ROTATE_180 | DRM_ROTATE_270;
-	} else if (INTEL_GEN(dev) >= 4) {
+	} else if (INTEL_GEN(dev_priv) >= 4) {
 		supported_rotations =
 			DRM_ROTATE_0 | DRM_ROTATE_180;
 	} else {
 		supported_rotations = DRM_ROTATE_0;
 	}
 
-	if (INTEL_GEN(dev) >= 4)
+	if (INTEL_GEN(dev_priv) >= 4)
 		drm_plane_create_rotation_property(&primary->base,
 						   DRM_ROTATE_0,
 						   supported_rotations);
@@ -15199,6 +15199,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
 {
 	struct intel_plane *cursor = NULL;
 	struct intel_plane_state *state = NULL;
+	struct drm_i915_private *dev_priv = to_i915(dev);
 	int ret;
 
 	cursor = kzalloc(sizeof(*cursor), GFP_KERNEL);
@@ -15228,7 +15229,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
 	if (ret)
 		goto fail;
 
-	if (INTEL_GEN(dev) >= 4)
+	if (INTEL_GEN(dev_priv) >= 4)
 		drm_plane_create_rotation_property(&cursor->base,
 						   DRM_ROTATE_0,
 						   DRM_ROTATE_0 |
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 9436d041389f..43d0350856e7 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1126,7 +1126,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
 		goto fail;
 	}
 
-	if (INTEL_GEN(dev) >= 9) {
+	if (INTEL_GEN(dev_priv) >= 9) {
 		supported_rotations =
 			DRM_ROTATE_0 | DRM_ROTATE_90 |
 			DRM_ROTATE_180 | DRM_ROTATE_270;
-- 
2.8.1

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "depot_save_stack" [drivers/gpu/drm/drm.ko] undefined!
ERROR: "depot_fetch_stack" [drivers/gpu/drm/drm.ko] undefined!

Caused by commit

  5705670d0463 ("drm: Track drm_mm allocators and show leaks on shutdown")

I hate used the drm-misc tree from next-20161108 for today.

-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/usb/Kconfig:39:error: recursive dependency detected!
drivers/usb/Kconfig:39: symbol USB is selected by MOUSE_APPLETOUCH
drivers/input/mouse/Kconfig:187:        symbol MOUSE_APPLETOUCH depends on INPUT
drivers/input/Kconfig:8:        symbol INPUT is selected by VT
drivers/tty/Kconfig:12: symbol VT is selected by FB_STI
drivers/video/fbdev/Kconfig:678:        symbol FB_STI depends on FB
drivers/video/fbdev/Kconfig:5:  symbol FB is selected by DRM_KMS_FB_HELPER
drivers/gpu/drm/Kconfig:72:     symbol DRM_KMS_FB_HELPER depends on DRM_KMS_HELPER
drivers/gpu/drm/Kconfig:66:     symbol DRM_KMS_HELPER is selected by DRM_NOUVEAU
drivers/gpu/drm/nouveau/Kconfig:1:      symbol DRM_NOUVEAU depends on LEDS_CLASS
drivers/leds/Kconfig:16:        symbol LEDS_CLASS is selected by OMAP_DEBUG_LEDS
arch/arm/plat-omap/Kconfig:19:  symbol OMAP_DEBUG_LEDS depends on NEW_LEDS
drivers/leds/Kconfig:8: symbol NEW_LEDS is selected by ATH9K_HTC
drivers/net/wireless/ath/ath9k/Kconfig:158:     symbol ATH9K_HTC depends on USB

Caused by commit

  a5ad0fd8524e ("drm: nouveau: fix build when LEDS_CLASS=m")

I have reverted that commit for today (just because I had to to make
sure that was the problem).

-- 
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi Jani,

On Thu, 05 Jan 2017 12:24:13 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
>
> Daniel reverted it in drm-misc.

OK, thanks.

-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip':
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
  ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
        ^
In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0:
include/drm/drm_atomic_helper.h:126:5: note: declared here
 int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
     ^
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip':
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
  ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
        ^
In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0:
include/drm/drm_atomic_helper.h:126:5: note: declared here
 int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
     ^

Caused by commit

  41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)")

interacting with commits

  904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU")
  b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU")

from the drm tree.

I added this merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 3 Apr 2017 13:25:55 +1000
Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change

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

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 02b8f2541dca..8d7dc9def7c2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc,
 		return -EINVAL;
 
 	flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
-	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
+	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
 	if (ret) {
 		DRM_ERROR("Page flip error %d.\n", ret);
 		return ret;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index e59bbcd8b226..bad31bdf09b6 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc,
 	 * don't hand it to the helper.
 	 */
 	flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
-	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
+	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
 	if (ret) {
 		DRM_ERROR("Page flip error %d.\n", ret);
 		return ret;
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Sinclair Yeh]

Thanks for this.   This and "drm/vmwgfx: merge fixup for set_config API change":

Reviewed-by: Sinclair Yeh <syeh@vmware.com>

On Mon, Apr 03, 2017 at 01:31:29PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c: In function 'vmw_sou_crtc_page_flip':
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:327:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
>   ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
>         ^
> In file included from drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c:31:0:
> include/drm/drm_atomic_helper.h:126:5: note: declared here
>  int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
>      ^
> drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c: In function 'vmw_stdu_crtc_page_flip':
> drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:508:8: error: too few arguments to function 'drm_atomic_helper_page_flip'
>   ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
>         ^
> In file included from drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c:32:0:
> include/drm/drm_atomic_helper.h:126:5: note: declared here
>  int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
>      ^
> 
> Caused by commit
> 
>   41292b1fa13a ("drm: Add acquire ctx parameter to ->page_flip(_target)")
> 
> interacting with commits
> 
>   904bb5e5817f ("drm/vmwgfx: Switch over to internal atomic API for STDU")
>   b0119cb9229d ("drm/vmwgfx: Switch over to internal atomic API for SOU and LDU")
> 
> from the drm tree.
> 
> I added this merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 3 Apr 2017 13:25:55 +1000
> Subject: [PATCH] drm/vmwgfx: merge fixup for page_flip API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> index 02b8f2541dca..8d7dc9def7c2 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> @@ -324,7 +324,7 @@ static int vmw_sou_crtc_page_flip(struct drm_crtc *crtc,
>  		return -EINVAL;
>  
>  	flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
> -	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
> +	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
>  	if (ret) {
>  		DRM_ERROR("Page flip error %d.\n", ret);
>  		return ret;
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> index e59bbcd8b226..bad31bdf09b6 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> @@ -505,7 +505,7 @@ static int vmw_stdu_crtc_page_flip(struct drm_crtc *crtc,
>  	 * don't hand it to the helper.
>  	 */
>  	flags &= ~DRM_MODE_PAGE_FLIP_ASYNC;
> -	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags);
> +	ret = drm_atomic_helper_page_flip(crtc, new_fb, NULL, flags, ctx);
>  	if (ret) {
>  		DRM_ERROR("Page flip error %d.\n", ret);
>  		return ret;
> -- 
> 2.11.0
> 
> -- 
> Cheers,
> Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
  .kmap_atomic = tee_shm_op_kmap_atomic,
  ^
drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .kmap_atomic = tee_shm_op_kmap_atomic,
                 ^
drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
  .kmap = tee_shm_op_kmap,
  ^
drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .kmap = tee_shm_op_kmap,
          ^
drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')

Caused by commit

  f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")

interacting with commit

  967c9cca2cc5 ("tee: generic TEE subsystem")

from the arm-soc tree.

I applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Apr 2017 12:06:32 +1000
Subject: [PATCH] tee: merge fix for dma-ops field name changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/tee/tee_shm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 0be1e3e93bee..4e14c9c9cb1c 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
 	.map_dma_buf = tee_shm_op_map_dma_buf,
 	.unmap_dma_buf = tee_shm_op_unmap_dma_buf,
 	.release = tee_shm_op_release,
-	.kmap_atomic = tee_shm_op_kmap_atomic,
-	.kmap = tee_shm_op_kmap,
+	.map_atomic = tee_shm_op_kmap_atomic,
+	.map = tee_shm_op_kmap,
 	.mmap = tee_shm_op_mmap,
 };
 
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Logan Gunthorpe]

Thanks Stephen. Looks good to me.

Logan

On 20/04/17 08:10 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
>   .kmap_atomic = tee_shm_op_kmap_atomic,
>   ^
> drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .kmap_atomic = tee_shm_op_kmap_atomic,
>                  ^
> drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
>   .kmap = tee_shm_op_kmap,
>   ^
> drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .kmap = tee_shm_op_kmap,
>           ^
> drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
> 
> Caused by commit
> 
>   f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
> 
> interacting with commit
> 
>   967c9cca2cc5 ("tee: generic TEE subsystem")
> 
> from the arm-soc tree.
> 
> I applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 21 Apr 2017 12:06:32 +1000
> Subject: [PATCH] tee: merge fix for dma-ops field name changes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/tee/tee_shm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 0be1e3e93bee..4e14c9c9cb1c 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
>  	.map_dma_buf = tee_shm_op_map_dma_buf,
>  	.unmap_dma_buf = tee_shm_op_unmap_dma_buf,
>  	.release = tee_shm_op_release,
> -	.kmap_atomic = tee_shm_op_kmap_atomic,
> -	.kmap = tee_shm_op_kmap,
> +	.map_atomic = tee_shm_op_kmap_atomic,
> +	.map = tee_shm_op_kmap,
>  	.mmap = tee_shm_op_mmap,
>  };
>  
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
>   .kmap_atomic = tee_shm_op_kmap_atomic,
>   ^
> drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .kmap_atomic = tee_shm_op_kmap_atomic,
>                  ^
> drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
>   .kmap = tee_shm_op_kmap,
>   ^
> drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .kmap = tee_shm_op_kmap,
>           ^
> drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
> 
> Caused by commit
> 
>   f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
> 
> interacting with commit
> 
>   967c9cca2cc5 ("tee: generic TEE subsystem")
> 
> from the arm-soc tree.
> 
> I applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 21 Apr 2017 12:06:32 +1000
> Subject: [PATCH] tee: merge fix for dma-ops field name changes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/tee/tee_shm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 0be1e3e93bee..4e14c9c9cb1c 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
>  	.map_dma_buf = tee_shm_op_map_dma_buf,
>  	.unmap_dma_buf = tee_shm_op_unmap_dma_buf,
>  	.release = tee_shm_op_release,
> -	.kmap_atomic = tee_shm_op_kmap_atomic,
> -	.kmap = tee_shm_op_kmap,
> +	.map_atomic = tee_shm_op_kmap_atomic,
> +	.map = tee_shm_op_kmap,
>  	.mmap = tee_shm_op_mmap,
>  };
>  
> -- 
> 2.11.0

This merge fix is now needed when I merge the drm tree (as Dave merged
the drm-misc tree).
-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Mon, Apr 24, 2017 at 11:25:12AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
> >   .kmap_atomic = tee_shm_op_kmap_atomic,
> >   ^
> > drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> >   .kmap_atomic = tee_shm_op_kmap_atomic,
> >                  ^
> > drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> > drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
> >   .kmap = tee_shm_op_kmap,
> >   ^
> > drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> >   .kmap = tee_shm_op_kmap,
> >           ^
> > drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
> > 
> > Caused by commit
> > 
> >   f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
> > 
> > interacting with commit
> > 
> >   967c9cca2cc5 ("tee: generic TEE subsystem")
> > 
> > from the arm-soc tree.
> > 
> > I applied the following merge fix patch for today:
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 21 Apr 2017 12:06:32 +1000
> > Subject: [PATCH] tee: merge fix for dma-ops field name changes
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/tee/tee_shm.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> > index 0be1e3e93bee..4e14c9c9cb1c 100644
> > --- a/drivers/tee/tee_shm.c
> > +++ b/drivers/tee/tee_shm.c
> > @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
> >  	.map_dma_buf = tee_shm_op_map_dma_buf,
> >  	.unmap_dma_buf = tee_shm_op_unmap_dma_buf,
> >  	.release = tee_shm_op_release,
> > -	.kmap_atomic = tee_shm_op_kmap_atomic,
> > -	.kmap = tee_shm_op_kmap,
> > +	.map_atomic = tee_shm_op_kmap_atomic,
> > +	.map = tee_shm_op_kmap,
> >  	.mmap = tee_shm_op_mmap,
> >  };

Since this is an all-new driver it might be best to stagger the pull
requests and merge the new tee subsystem (or whatever it is) after drm?

Not sure what to best do here ...
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi Daniel,

On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@ffwll.ch> wrote:
>
> Since this is an all-new driver it might be best to stagger the pull
> requests and merge the new tee subsystem (or whatever it is) after drm?
> 
> Not sure what to best do here ...

This will merge via Dave, so Dave just needs to let Linus know that a
fix up is needed when this merges with the arm-soc stuff in Linus' tree.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the drm-misc tree

[Arnd Bergmann]

On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Daniel,
>
> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@ffwll.ch> wrote:
>>
>> Since this is an all-new driver it might be best to stagger the pull
>> requests and merge the new tee subsystem (or whatever it is) after drm?
>>
>> Not sure what to best do here ...
>
> This will merge via Dave, so Dave just needs to let Linus know that a
> fix up is needed when this merges with the arm-soc stuff in Linus' tree.

The TEE subsystem is currently on a separate branch by itself in arm-soc,
so we could easily delay that until DRM is in, and point out the resolution
here.

       Arnd

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Tue, May 2, 2017 at 10:55 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi Daniel,
>>
>> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter <daniel@ffwll.ch> wrote:
>>>
>>> Since this is an all-new driver it might be best to stagger the pull
>>> requests and merge the new tee subsystem (or whatever it is) after drm?
>>>
>>> Not sure what to best do here ...
>>
>> This will merge via Dave, so Dave just needs to let Linus know that a
>> fix up is needed when this merges with the arm-soc stuff in Linus' tree.
>
> The TEE subsystem is currently on a separate branch by itself in arm-soc,
> so we could easily delay that until DRM is in, and point out the resolution
> here.

Dave is somewhere without mail, but I chatted with him quickly and he
agrees this seems simplest. drm-next main pull should go out somewhere
tomorrow he said.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
>   .kmap_atomic = tee_shm_op_kmap_atomic,
>   ^
> drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .kmap_atomic = tee_shm_op_kmap_atomic,
>                  ^
> drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
>   .kmap = tee_shm_op_kmap,
>   ^
> drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .kmap = tee_shm_op_kmap,
>           ^
> drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
> 
> Caused by commit
> 
>   f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
> 
> interacting with commit
> 
>   967c9cca2cc5 ("tee: generic TEE subsystem")
> 
> from the arm-soc tree.
> 
> I applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 21 Apr 2017 12:06:32 +1000
> Subject: [PATCH] tee: merge fix for dma-ops field name changes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/tee/tee_shm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 0be1e3e93bee..4e14c9c9cb1c 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
>  	.map_dma_buf = tee_shm_op_map_dma_buf,
>  	.unmap_dma_buf = tee_shm_op_unmap_dma_buf,
>  	.release = tee_shm_op_release,
> -	.kmap_atomic = tee_shm_op_kmap_atomic,
> -	.kmap = tee_shm_op_kmap,
> +	.map_atomic = tee_shm_op_kmap_atomic,
> +	.map = tee_shm_op_kmap,
>  	.mmap = tee_shm_op_mmap,
>  };
>  
> -- 
> 2.11.0

This fixup is now needed when merging the arm-soc tree with Linus' tree.
-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:


Caused by commit

  b6dcaaac4474 ("drm/vblank: _ioctl posfix for ioctl handler")

interacting with commit

  d5288c88c67c ("switch compat_drm_wait_vblank() to drm_ioctl_kernel()")

from Linus' tree.

You should consider rebasing your branch onto v4.13-rc1 (or merging
v4.13-rc1) so that these (unnecessary) conflicts don't keep happening
during development and the next merge window.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Jul 2017 11:35:10 +1000
Subject: [PATCH] drm/vblank: fix for "switch compat_drm_wait_vblank() to
 drm_ioctl_kernel()"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/drm_ioc32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index d1f202852028..f8e96e648acf 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -842,7 +842,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
 	req.request.type = req32.request.type;
 	req.request.sequence = req32.request.sequence;
 	req.request.signal = req32.request.signal;
-	err = drm_ioctl_kernel(file, drm_wait_vblank, &req, DRM_UNLOCKED);
+	err = drm_ioctl_kernel(file, drm_wait_vblank_ioctl, &req, DRM_UNLOCKED);
 	if (err)
 		return err;
 
-- 
2.13.2

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer
  .set_busid = drm_pci_set_busid,
  ^
drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function)
  .set_busid = drm_pci_set_busid,
               ^
drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init':
drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration]
  return drm_pci_init(&driver, &vbox_pci_driver);
         ^
drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit':
drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration]
  drm_pci_exit(&driver, &vbox_pci_driver);
  ^

Caused by commits

  5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook")
  10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely")

interacting with commit

  dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging")

from the staging.current tree.

I have applied the following merge fix patch - please check that it
is correct.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jul 2017 11:41:01 +1000
Subject: [PATCH] drm: fixes for staging due to API changes in the drm core

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/staging/vboxvideo/vbox_drv.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c
index 92ae1560a16d..6d0600c37c0c 100644
--- a/drivers/staging/vboxvideo/vbox_drv.c
+++ b/drivers/staging/vboxvideo/vbox_drv.c
@@ -232,7 +232,6 @@ static struct drm_driver driver = {
 	.lastclose = vbox_driver_lastclose,
 	.master_set = vbox_master_set,
 	.master_drop = vbox_master_drop,
-	.set_busid = drm_pci_set_busid,
 
 	.fops = &vbox_fops,
 	.irq_handler = vbox_irq_handler,
@@ -270,12 +269,12 @@ static int __init vbox_init(void)
 	if (vbox_modeset == 0)
 		return -EINVAL;
 
-	return drm_pci_init(&driver, &vbox_pci_driver);
+	return pci_register_driver(&vbox_pci_driver);
 }
 
 static void __exit vbox_exit(void)
 {
-	drm_pci_exit(&driver, &vbox_pci_driver);
+	pci_unregister_driver(&vbox_pci_driver);
 }
 
 module_init(vbox_init);
-- 
2.13.2

-- 
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi Dave,

The following is now applicable to the drm and staging.current trees ...

On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer
>   .set_busid = drm_pci_set_busid,
>   ^
> drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function)
>   .set_busid = drm_pci_set_busid,
>                ^
> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init':
> drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration]
>   return drm_pci_init(&driver, &vbox_pci_driver);
>          ^
> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit':
> drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration]
>   drm_pci_exit(&driver, &vbox_pci_driver);
>   ^
> 
> Caused by commits
> 
>   5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook")
>   10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely")
> 
> interacting with commit
> 
>   dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging")
> 
> from the staging.current tree.
> 
> I have applied the following merge fix patch - please check that it
> is correct.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 19 Jul 2017 11:41:01 +1000
> Subject: [PATCH] drm: fixes for staging due to API changes in the drm core
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/staging/vboxvideo/vbox_drv.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c
> index 92ae1560a16d..6d0600c37c0c 100644
> --- a/drivers/staging/vboxvideo/vbox_drv.c
> +++ b/drivers/staging/vboxvideo/vbox_drv.c
> @@ -232,7 +232,6 @@ static struct drm_driver driver = {
>  	.lastclose = vbox_driver_lastclose,
>  	.master_set = vbox_master_set,
>  	.master_drop = vbox_master_drop,
> -	.set_busid = drm_pci_set_busid,
>  
>  	.fops = &vbox_fops,
>  	.irq_handler = vbox_irq_handler,
> @@ -270,12 +269,12 @@ static int __init vbox_init(void)
>  	if (vbox_modeset == 0)
>  		return -EINVAL;
>  
> -	return drm_pci_init(&driver, &vbox_pci_driver);
> +	return pci_register_driver(&vbox_pci_driver);
>  }
>  
>  static void __exit vbox_exit(void)
>  {
> -	drm_pci_exit(&driver, &vbox_pci_driver);
> +	pci_unregister_driver(&vbox_pci_driver);
>  }
>  
>  module_init(vbox_init);
> -- 
> 2.13.2

-- 
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

Hi Greg&Hans,

How are we going to handle this now? The refactor is deeply burried in
drm-misc, I guess you could cherry-pick the relevant patches over. But
that'll probably lead to more conflicts because git will get confused.

Or you could just delete the set_busid hook in -staging, which renders
the driver unbisectable since it'll only work when merged together
with the drm trees.

This is pretty much why I don't like -staging, it makes cross
subsystem refactorings (which is already hard, getting 20+ driver
folks to agree on stuff sometimes) unecessarily harder.

Cheers, Daniel

On Fri, Jul 21, 2017 at 2:08 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> The following is now applicable to the drm and staging.current trees ...
>
> On Wed, 19 Jul 2017 11:46:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer
>>   .set_busid = drm_pci_set_busid,
>>   ^
>> drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function)
>>   .set_busid = drm_pci_set_busid,
>>                ^
>> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init':
>> drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration]
>>   return drm_pci_init(&driver, &vbox_pci_driver);
>>          ^
>> drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit':
>> drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration]
>>   drm_pci_exit(&driver, &vbox_pci_driver);
>>   ^
>>
>> Caused by commits
>>
>>   5c484cee7ef9 ("drm: Remove drm_driver->set_busid hook")
>>   10631d724def ("drm/pci: Deprecate drm_pci_init/exit completely")
>>
>> interacting with commit
>>
>>   dd55d44f4084 ("staging: vboxvideo: Add vboxvideo to drivers/staging")
>>
>> from the staging.current tree.
>>
>> I have applied the following merge fix patch - please check that it
>> is correct.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Wed, 19 Jul 2017 11:41:01 +1000
>> Subject: [PATCH] drm: fixes for staging due to API changes in the drm core
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  drivers/staging/vboxvideo/vbox_drv.c | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c
>> index 92ae1560a16d..6d0600c37c0c 100644
>> --- a/drivers/staging/vboxvideo/vbox_drv.c
>> +++ b/drivers/staging/vboxvideo/vbox_drv.c
>> @@ -232,7 +232,6 @@ static struct drm_driver driver = {
>>       .lastclose = vbox_driver_lastclose,
>>       .master_set = vbox_master_set,
>>       .master_drop = vbox_master_drop,
>> -     .set_busid = drm_pci_set_busid,
>>
>>       .fops = &vbox_fops,
>>       .irq_handler = vbox_irq_handler,
>> @@ -270,12 +269,12 @@ static int __init vbox_init(void)
>>       if (vbox_modeset == 0)
>>               return -EINVAL;
>>
>> -     return drm_pci_init(&driver, &vbox_pci_driver);
>> +     return pci_register_driver(&vbox_pci_driver);
>>  }
>>
>>  static void __exit vbox_exit(void)
>>  {
>> -     drm_pci_exit(&driver, &vbox_pci_driver);
>> +     pci_unregister_driver(&vbox_pci_driver);
>>  }
>>
>>  module_init(vbox_init);
>> --
>> 2.13.2
>
> --
> Cheers,
> Stephen Rothwell



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Hans de Goede]

Hi,

On 21-07-17 09:24, Daniel Vetter wrote:
> Hi Greg&Hans,
> 
> How are we going to handle this now? The refactor is deeply burried in
> drm-misc, I guess you could cherry-pick the relevant patches over. But
> that'll probably lead to more conflicts because git will get confused.
> 
> Or you could just delete the set_busid hook in -staging, which renders
> the driver unbisectable since it'll only work when merged together
> with the drm trees.

Removing the set_busid hook in staging (but only for -next, not
for -linus) is fine with me.

Regards,

Hans

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi Daniel,

On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> How are we going to handle this now? The refactor is deeply burried in
> drm-misc, I guess you could cherry-pick the relevant patches over. But
> that'll probably lead to more conflicts because git will get confused.

I'll just keep applying the merge resolution patch and will remind Dave
and Greg about it during the week before the merge window opens so that
they can let Linus know that the fix up is needed.

-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Daniel,
>
> On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>>
>> How are we going to handle this now? The refactor is deeply burried in
>> drm-misc, I guess you could cherry-pick the relevant patches over. But
>> that'll probably lead to more conflicts because git will get confused.
>
> I'll just keep applying the merge resolution patch and will remind Dave
> and Greg about it during the week before the merge window opens so that
> they can let Linus know that the fix up is needed.

Well, Greg squeezed the vbox driver into -rc2, so now we already get
to resolve this in a backmerge. And hopefully the bikeshed patches in
-staging won't interfere too badly with whatever refactoring we'll do
in drm-next.

Greg, fyi this is the last time I'll ack a drm driver for staging.
This just doesn't work. We're spending more time here working the
-staging vs. drm-next conflicts than the actual vbox driver review has
taken me. And probly less than the cleanup for merging directly to
drm-next will end up taking.

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: linux-next: build failure after merge of the drm-misc tree

[Greg KH]

On Mon, Jul 24, 2017 at 10:24:41AM +0200, Daniel Vetter wrote:
> On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Daniel,
> >
> > On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> >>
> >> How are we going to handle this now? The refactor is deeply burried in
> >> drm-misc, I guess you could cherry-pick the relevant patches over. But
> >> that'll probably lead to more conflicts because git will get confused.
> >
> > I'll just keep applying the merge resolution patch and will remind Dave
> > and Greg about it during the week before the merge window opens so that
> > they can let Linus know that the fix up is needed.
> 
> Well, Greg squeezed the vbox driver into -rc2, so now we already get
> to resolve this in a backmerge. And hopefully the bikeshed patches in
> -staging won't interfere too badly with whatever refactoring we'll do
> in drm-next.
> 
> Greg, fyi this is the last time I'll ack a drm driver for staging.
> This just doesn't work. We're spending more time here working the
> -staging vs. drm-next conflicts than the actual vbox driver review has
> taken me. And probly less than the cleanup for merging directly to
> drm-next will end up taking.

Hey, I was amazed that you all acked it, and it's why I required that
you do so before I took it :)

Good luck with the merges!

greg k-h
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/i915/intel_dsi.c: In function 'intel_dsi_get_panel_orientation':
drivers/gpu/drm/i915/intel_dsi.c:1673:13: error: storage size of 'plane' isn't known
  enum plane plane;
             ^

Caused by commit

  82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")

interacting with commit

  ed15030d7ab0 ("drm/i915: s/enum plane/enum i9xx_plane_id/")

from the drm-intel tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Dec 2017 11:56:32 +1100
Subject: [PATCH] drm/i915: fix up for "drm/i915: s/enum plane/enum
 i9xx_plane_id/"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/intel_dsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index 1b60df3c14a0..f67d321376e4 100644
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1670,7 +1670,7 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector)
 {
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL;
-	enum plane plane;
+	enum i9xx_plane_id plane;
 	u32 val;
 
 	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
-- 
2.15.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 886 bytes --]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/v3d/v3d_gem.c: In function 'v3d_submit_tfu_ioctl':
drivers/gpu/drm/v3d/v3d_gem.c:719:3: error: too many arguments to function 'drm_syncobj_replace_fence'
   drm_syncobj_replace_fence(sync_out, 0, sched_done_fence);
   ^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_gem.c:5:
include/drm/drm_syncobj.h:134:6: note: declared here
 void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
      ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  0b258ed1a219 ("drm: revert "expand replace_fence to support timeline point v2"")

interacting with commit

  1584f16ca96e ("drm/v3d: Add support for submitting jobs to the TFU")

I have used the drm-misc tree from next-20181205 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Koenig, Christian]

Hi Stephen,

yeah, that is a known problem. I missed the change during rebase of the 
revert.

Please see patch "2312f9842854 drm/v3d: fix broken build" which is 
already in drm-misc-next and fixes the issue.

Christian.

Am 06.12.18 um 03:32 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/v3d/v3d_gem.c: In function 'v3d_submit_tfu_ioctl':
> drivers/gpu/drm/v3d/v3d_gem.c:719:3: error: too many arguments to function 'drm_syncobj_replace_fence'
>     drm_syncobj_replace_fence(sync_out, 0, sched_done_fence);
>     ^~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/v3d/v3d_gem.c:5:
> include/drm/drm_syncobj.h:134:6: note: declared here
>   void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,
>        ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>    0b258ed1a219 ("drm: revert "expand replace_fence to support timeline point v2"")
>
> interacting with commit
>
>    1584f16ca96e ("drm/v3d: Add support for submitting jobs to the TFU")
>
> I have used the drm-misc tree from next-20181205 for today.
>

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_mode_config_init':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
  drm_atomic_private_obj_init(&adev->dm.atomic_obj,
                              ^~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
                 from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *'
 void drm_atomic_private_obj_init(struct drm_device *dev,
                                  ~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
         &state->base,
         ^~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
                 from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *'
      struct drm_private_obj *obj,
      ~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
         &dm_atomic_state_funcs);
         ^~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
                 from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'struct drm_private_state_funcs *'
      struct drm_private_state *state,
      ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: too few arguments to function 'drm_atomic_private_obj_init'
  drm_atomic_private_obj_init(&adev->dm.atomic_obj,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from include/drm/drm_dp_mst_helper.h:27,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
                 from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
include/drm/drm_atomic.h:437:6: note: declared here
 void drm_atomic_private_obj_init(struct drm_device *dev,
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")

interacting with commit

  eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")

from Linus' tree (merged during the merge window).

Its not obvious how to fix this up, so I have used the drm-misc tree
from next-20190107 for today.

-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Tue, Jan 08, 2019 at 11:12:41AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_mode_config_init':
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>   drm_atomic_private_obj_init(&adev->dm.atomic_obj,
>                               ^~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>                  from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *'
>  void drm_atomic_private_obj_init(struct drm_device *dev,
>                                   ~~~~~~~~~~~~~~~~~~~^~~
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>          &state->base,
>          ^~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>                  from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *'
>       struct drm_private_obj *obj,
>       ~~~~~~~~~~~~~~~~~~~~~~~~^~~
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>          &dm_atomic_state_funcs);
>          ^~~~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>                  from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'struct drm_private_state_funcs *'
>       struct drm_private_state *state,
>       ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: too few arguments to function 'drm_atomic_private_obj_init'
>   drm_atomic_private_obj_init(&adev->dm.atomic_obj,
>   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from include/drm/drm_dp_mst_helper.h:27,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>                  from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
> include/drm/drm_atomic.h:437:6: note: declared here
>  void drm_atomic_private_obj_init(struct drm_device *dev,
>       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
> 
> interacting with commit
> 
>   eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")
> 
> from Linus' tree (merged during the merge window).
> 
> Its not obvious how to fix this up, so I have used the drm-misc tree
> from next-20190107 for today.

https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache

is the fixup you want. Should get baked into drm-next any moment, since
the first drm-misc-next pull is already out.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Kazlauskas, Nicholas]

On 1/8/19 3:37 AM, Daniel Vetter wrote:
> On Tue, Jan 08, 2019 at 11:12:41AM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_mode_config_init':
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:30: error: passing argument 1 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>>    drm_atomic_private_obj_init(&adev->dm.atomic_obj,
>>                                ^~~~~~~~~~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>>                   from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:437:53: note: expected 'struct drm_device *' but argument is of type 'struct drm_private_obj *'
>>   void drm_atomic_private_obj_init(struct drm_device *dev,
>>                                    ~~~~~~~~~~~~~~~~~~~^~~
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1696:9: error: passing argument 2 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>>           &state->base,
>>           ^~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>>                   from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:438:30: note: expected 'struct drm_private_obj *' but argument is of type 'struct drm_private_state *'
>>        struct drm_private_obj *obj,
>>        ~~~~~~~~~~~~~~~~~~~~~~~~^~~
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1697:9: error: passing argument 3 of 'drm_atomic_private_obj_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
>>           &dm_atomic_state_funcs);
>>           ^~~~~~~~~~~~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>>                   from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:439:32: note: expected 'struct drm_private_state *' but argument is of type 'struct drm_private_state_funcs *'
>>        struct drm_private_state *state,
>>        ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1695:2: error: too few arguments to function 'drm_atomic_private_obj_init'
>>    drm_atomic_private_obj_init(&adev->dm.atomic_obj,
>>    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> In file included from include/drm/drm_dp_mst_helper.h:27,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h:46,
>>                   from drivers/gpu/drm/amd/amdgpu/amdgpu.h:57,
>>                   from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:34:
>> include/drm/drm_atomic.h:437:6: note: declared here
>>   void drm_atomic_private_obj_init(struct drm_device *dev,
>>        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> Caused by commit
>>
>>    b962a12050a3 ("drm/atomic: integrate modeset lock with private objects")
>>
>> interacting with commit
>>
>>    eb3dc8978596 ("drm/amd/display: Use private obj helpers for dm_atomic_state")
>>
>> from Linus' tree (merged during the merge window).
>>
>> Its not obvious how to fix this up, so I have used the drm-misc tree
>> from next-20190107 for today.
> 
> https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache
> 
> is the fixup you want. Should get baked into drm-next any moment, since
> the first drm-misc-next pull is already out.
> -Daniel
>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>

Thanks, that lines up with the other driver fixes that patch added.

I missed that series when I was developing the private state object 
patch for amdgpu.

I'll still need to remove our extra lock since the objects now have 
their own, but that can come later in another non-fixup patch.

Nicholas Kazlauskas
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi Daniel,

On Tue, 8 Jan 2019 09:37:22 +0100 Daniel Vetter <daniel@ffwll.ch> wrote:
>
> 
> https://cgit.freedesktop.org/drm-tip/tree/fixups/drm-misc-next.patch?h=rerere-cache
> 
> is the fixup you want. Should get baked into drm-next any moment, since
> the first drm-misc-next pull is already out.

I added that resolution for today, thanks.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1560 bytes --]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/gpu/drm/arm/display/komeda/komeda_drv.c:13:
drivers/gpu/drm/arm/display/komeda/komeda_kms.h:87:20: error: field 'base' has incomplete type
  struct drm_device base;
                    ^~~~
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_parse_pipe_dt':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:27:3: error: implicit declaration of function 'DRM_ERROR'; did you mean 'DRM_IOR'? [-Werror=implicit-function-declaration]
   DRM_ERROR("get aclk for pipeline %d failed!\n", pipe_id);
   ^~~~~~~~~
   DRM_IOR
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_create':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:127:2: error: implicit declaration of function 'DRM_INFO'; did you mean 'DRM_IO'? [-Werror=implicit-function-declaration]
  DRM_INFO("Found ARM Mali-D%x version r%dp%d\n",
  ^~~~~~~~
  DRM_IO
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_destroy':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:170:3: error: implicit declaration of function 'devm_iounmap'; did you mean 'pci_iounmap'? [-Werror=implicit-function-declaration]
   devm_iounmap(dev, mdev->reg_base);
   ^~~~~~~~~~~~
   pci_iounmap

and lots more ...

Probably caused by commit

  e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h")

I have used the drm-misc tree from next-20190207 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Fri, Feb 8, 2019 at 2:38 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/gpu/drm/arm/display/komeda/komeda_drv.c:13:
> drivers/gpu/drm/arm/display/komeda/komeda_kms.h:87:20: error: field 'base' has incomplete type
>   struct drm_device base;
>                     ^~~~
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_parse_pipe_dt':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:27:3: error: implicit declaration of function 'DRM_ERROR'; did you mean 'DRM_IOR'? [-Werror=implicit-function-declaration]
>    DRM_ERROR("get aclk for pipeline %d failed!\n", pipe_id);
>    ^~~~~~~~~
>    DRM_IOR
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_create':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:127:2: error: implicit declaration of function 'DRM_INFO'; did you mean 'DRM_IO'? [-Werror=implicit-function-declaration]
>   DRM_INFO("Found ARM Mali-D%x version r%dp%d\n",
>   ^~~~~~~~
>   DRM_IO
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_destroy':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:170:3: error: implicit declaration of function 'devm_iounmap'; did you mean 'pci_iounmap'? [-Werror=implicit-function-declaration]
>    devm_iounmap(dev, mdev->reg_base);
>    ^~~~~~~~~~~~
>    pci_iounmap
>
> and lots more ...
>
> Probably caused by commit
>
>   e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h")
>
> I have used the drm-misc tree from next-20190207 for today.

Yup.

Sam, can you pls take a look at what komeda needs? you need to
manually merge together drm-misc-next and drm-next first I think.

Dave, Maxime, Liviu: Heads up, drm-misc-next + drm-next will colide.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: linux-next: build failure after merge of the drm-misc tree

[Sam Ravnborg]

Hi Daniel/Stephen

Thanks for the report and the hints how to move forward to fix it.

> Sam, can you pls take a look at what komeda needs? you need to
> manually merge together drm-misc-next and drm-next first I think.

Merged the two tree and fixed build.
Undid the merge and checked that the build was still OK.

Patch sent to dri-devel:
https://lists.freedesktop.org/archives/dri-devel/2019-February/206662.html

> Dave, Maxime, Liviu: Heads up, drm-misc-next + drm-next will colide.
There was a trivial conflict when I merged, but in i915 so I just fixed
it up and kept focus on komeda.
So in other words, yes there is a conflict.

	Sam

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 3232 bytes --]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/kernel.h:7,
                 from include/asm-generic/bug.h:18,
                 from arch/x86/include/asm/bug.h:83,
                 from include/linux/bug.h:5,
                 from include/linux/mmdebug.h:5,
                 from include/linux/gfp.h:5,
                 from include/linux/slab.h:15,
                 from drivers/gpu/drm/lima/lima_ctx.c:4:
drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
 #define UINT_MAX (~0U)
                  ^~~~~
drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
  err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
                                    ^~~~~~~~
In file included from include/linux/radix-tree.h:31,
                 from include/linux/idr.h:15,
                 from include/drm/drm_device.h:7,
                 from drivers/gpu/drm/lima/lima_device.h:7,
                 from drivers/gpu/drm/lima/lima_ctx.c:6:
include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
   void *entry, struct xa_limit limit, gfp_t gfp)
   ~~~~~~^~~~~
drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
  err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
                                              ^~~
In file included from include/linux/radix-tree.h:31,
                 from include/linux/idr.h:15,
                 from include/drm/drm_device.h:7,
                 from drivers/gpu/drm/lima/lima_device.h:7,
                 from drivers/gpu/drm/lima/lima_ctx.c:6:
include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
   void *entry, struct xa_limit limit, gfp_t gfp)
                ~~~~~~~~~~~~~~~~^~~~~

Caused by commit

  a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")

interacting with commit

  a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")

from Linus' tree (v5.1-rc1).

I have applied the following patch for today.  It could be applied as
part of a merge of v5.1-rc1 into drm-misc.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Apr 2019 10:45:32 +1100
Subject: [PATCH] drm/lima: update for xa_alloc API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/lima/lima_ctx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
index c8d12f7c6894..bafa00d74cc5 100644
--- a/drivers/gpu/drm/lima/lima_ctx.c
+++ b/drivers/gpu/drm/lima/lima_ctx.c
@@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
 			goto err_out0;
 	}
 
-	err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
+	err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
 	if (err < 0)
 		goto err_out0;
 
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Qiang Yu]

Thanks, patch is:
Reviewed-by: Qiang Yu <yuq825@gmail.com>

Regards,
Qiang

On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from include/linux/kernel.h:7,
>                  from include/asm-generic/bug.h:18,
>                  from arch/x86/include/asm/bug.h:83,
>                  from include/linux/bug.h:5,
>                  from include/linux/mmdebug.h:5,
>                  from include/linux/gfp.h:5,
>                  from include/linux/slab.h:15,
>                  from drivers/gpu/drm/lima/lima_ctx.c:4:
> drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
>  #define UINT_MAX (~0U)
>                   ^~~~~
> drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
>   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
>                                     ^~~~~~~~
> In file included from include/linux/radix-tree.h:31,
>                  from include/linux/idr.h:15,
>                  from include/drm/drm_device.h:7,
>                  from drivers/gpu/drm/lima/lima_device.h:7,
>                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
>    void *entry, struct xa_limit limit, gfp_t gfp)
>    ~~~~~~^~~~~
> drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
>   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
>                                               ^~~
> In file included from include/linux/radix-tree.h:31,
>                  from include/linux/idr.h:15,
>                  from include/drm/drm_device.h:7,
>                  from drivers/gpu/drm/lima/lima_device.h:7,
>                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
>    void *entry, struct xa_limit limit, gfp_t gfp)
>                 ~~~~~~~~~~~~~~~~^~~~~
>
> Caused by commit
>
>   a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
>
> interacting with commit
>
>   a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
>
> from Linus' tree (v5.1-rc1).
>
> I have applied the following patch for today.  It could be applied as
> part of a merge of v5.1-rc1 into drm-misc.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 2 Apr 2019 10:45:32 +1100
> Subject: [PATCH] drm/lima: update for xa_alloc API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/lima/lima_ctx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> index c8d12f7c6894..bafa00d74cc5 100644
> --- a/drivers/gpu/drm/lima/lima_ctx.c
> +++ b/drivers/gpu/drm/lima/lima_ctx.c
> @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
>                         goto err_out0;
>         }
>
> -       err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> +       err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
>         if (err < 0)
>                 goto err_out0;
>
> --
> 2.20.1
>
> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> Thanks, patch is:
> Reviewed-by: Qiang Yu <yuq825@gmail.com>

Good time to get started with committing patches? In general it's kinda
confusing if the maintainer r-bs a patch, but doesn't say whether/when/how
it gets merged. Big chance the patch will get lost in limbo and fall
through cracks.
-Daniel

> 
> Regards,
> Qiang
> 
> On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In file included from include/linux/kernel.h:7,
> >                  from include/asm-generic/bug.h:18,
> >                  from arch/x86/include/asm/bug.h:83,
> >                  from include/linux/bug.h:5,
> >                  from include/linux/mmdebug.h:5,
> >                  from include/linux/gfp.h:5,
> >                  from include/linux/slab.h:15,
> >                  from drivers/gpu/drm/lima/lima_ctx.c:4:
> > drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> > include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
> >  #define UINT_MAX (~0U)
> >                   ^~~~~
> > drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
> >   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> >                                     ^~~~~~~~
> > In file included from include/linux/radix-tree.h:31,
> >                  from include/linux/idr.h:15,
> >                  from include/drm/drm_device.h:7,
> >                  from drivers/gpu/drm/lima/lima_device.h:7,
> >                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> > include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
> >    void *entry, struct xa_limit limit, gfp_t gfp)
> >    ~~~~~~^~~~~
> > drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
> >   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> >                                               ^~~
> > In file included from include/linux/radix-tree.h:31,
> >                  from include/linux/idr.h:15,
> >                  from include/drm/drm_device.h:7,
> >                  from drivers/gpu/drm/lima/lima_device.h:7,
> >                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> > include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
> >    void *entry, struct xa_limit limit, gfp_t gfp)
> >                 ~~~~~~~~~~~~~~~~^~~~~
> >
> > Caused by commit
> >
> >   a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
> >
> > interacting with commit
> >
> >   a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
> >
> > from Linus' tree (v5.1-rc1).
> >
> > I have applied the following patch for today.  It could be applied as
> > part of a merge of v5.1-rc1 into drm-misc.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 2 Apr 2019 10:45:32 +1100
> > Subject: [PATCH] drm/lima: update for xa_alloc API change
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/gpu/drm/lima/lima_ctx.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> > index c8d12f7c6894..bafa00d74cc5 100644
> > --- a/drivers/gpu/drm/lima/lima_ctx.c
> > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> >                         goto err_out0;
> >         }
> >
> > -       err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > +       err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> >         if (err < 0)
> >                 goto err_out0;
> >
> > --
> > 2.20.1
> >
> > --
> > Cheers,
> > Stephen Rothwell

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: linux-next: build failure after merge of the drm-misc tree

[Qiang Yu]

On Tue, Apr 2, 2019 at 3:57 PM Daniel Vetter <daniel@ffwll.ch> wrote:
>
> On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > Thanks, patch is:
> > Reviewed-by: Qiang Yu <yuq825@gmail.com>
>
> Good time to get started with committing patches? In general it's kinda
> confusing if the maintainer r-bs a patch, but doesn't say whether/when/how
> it gets merged. Big chance the patch will get lost in limbo and fall
> through cracks.

Thanks for the remind, this patch should only be applied to drm-misc-next
branch when 5.1-rcx branch gets merged to drm-misc-next for the new
xa_alloc API. So I expect the guy who do the 5.1-rcx merge should apply
this patch. Who will do the merge?

Regards,
Qiang

>
> >
> > Regards,
> > Qiang
> >
> > On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > In file included from include/linux/kernel.h:7,
> > >                  from include/asm-generic/bug.h:18,
> > >                  from arch/x86/include/asm/bug.h:83,
> > >                  from include/linux/bug.h:5,
> > >                  from include/linux/mmdebug.h:5,
> > >                  from include/linux/gfp.h:5,
> > >                  from include/linux/slab.h:15,
> > >                  from drivers/gpu/drm/lima/lima_ctx.c:4:
> > > drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> > > include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
> > >  #define UINT_MAX (~0U)
> > >                   ^~~~~
> > > drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
> > >   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > >                                     ^~~~~~~~
> > > In file included from include/linux/radix-tree.h:31,
> > >                  from include/linux/idr.h:15,
> > >                  from include/drm/drm_device.h:7,
> > >                  from drivers/gpu/drm/lima/lima_device.h:7,
> > >                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
> > >    void *entry, struct xa_limit limit, gfp_t gfp)
> > >    ~~~~~~^~~~~
> > > drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
> > >   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > >                                               ^~~
> > > In file included from include/linux/radix-tree.h:31,
> > >                  from include/linux/idr.h:15,
> > >                  from include/drm/drm_device.h:7,
> > >                  from drivers/gpu/drm/lima/lima_device.h:7,
> > >                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
> > >    void *entry, struct xa_limit limit, gfp_t gfp)
> > >                 ~~~~~~~~~~~~~~~~^~~~~
> > >
> > > Caused by commit
> > >
> > >   a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
> > >
> > > interacting with commit
> > >
> > >   a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
> > >
> > > from Linus' tree (v5.1-rc1).
> > >
> > > I have applied the following patch for today.  It could be applied as
> > > part of a merge of v5.1-rc1 into drm-misc.
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Tue, 2 Apr 2019 10:45:32 +1100
> > > Subject: [PATCH] drm/lima: update for xa_alloc API change
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  drivers/gpu/drm/lima/lima_ctx.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> > > index c8d12f7c6894..bafa00d74cc5 100644
> > > --- a/drivers/gpu/drm/lima/lima_ctx.c
> > > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> > >                         goto err_out0;
> > >         }
> > >
> > > -       err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > +       err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> > >         if (err < 0)
> > >                 goto err_out0;
> > >
> > > --
> > > 2.20.1
> > >
> > > --
> > > Cheers,
> > > Stephen Rothwell
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

Re: linux-next: build failure after merge of the drm-misc tree

[Daniel Vetter]

On Tue, Apr 02, 2019 at 04:59:37PM +0800, Qiang Yu wrote:
> On Tue, Apr 2, 2019 at 3:57 PM Daniel Vetter <daniel@ffwll.ch> wrote:
> >
> > On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > > Thanks, patch is:
> > > Reviewed-by: Qiang Yu <yuq825@gmail.com>
> >
> > Good time to get started with committing patches? In general it's kinda
> > confusing if the maintainer r-bs a patch, but doesn't say whether/when/how
> > it gets merged. Big chance the patch will get lost in limbo and fall
> > through cracks.
> 
> Thanks for the remind, this patch should only be applied to drm-misc-next
> branch when 5.1-rcx branch gets merged to drm-misc-next for the new
> xa_alloc API. So I expect the guy who do the 5.1-rcx merge should apply
> this patch. Who will do the merge?

Oh right, I was kinda not yet awake :-)

Yeah Dave/me and drm-misc maintainers will resolve this when drm-misc
lands in drm-next. Might then need a backmerge in drm-misc to roll
forward.
-Daniel

> 
> Regards,
> Qiang
> 
> >
> > >
> > > Regards,
> > > Qiang
> > >
> > > On Tue, Apr 2, 2019 at 7:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > >
> > > > In file included from include/linux/kernel.h:7,
> > > >                  from include/asm-generic/bug.h:18,
> > > >                  from arch/x86/include/asm/bug.h:83,
> > > >                  from include/linux/bug.h:5,
> > > >                  from include/linux/mmdebug.h:5,
> > > >                  from include/linux/gfp.h:5,
> > > >                  from include/linux/slab.h:15,
> > > >                  from drivers/gpu/drm/lima/lima_ctx.c:4:
> > > > drivers/gpu/drm/lima/lima_ctx.c: In function 'lima_ctx_create':
> > > > include/linux/limits.h:13:18: warning: passing argument 3 of 'xa_alloc' makes pointer from integer without a cast [-Wint-conversion]
> > > >  #define UINT_MAX (~0U)
> > > >                   ^~~~~
> > > > drivers/gpu/drm/lima/lima_ctx.c:26:36: note: in expansion of macro 'UINT_MAX'
> > > >   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > >                                     ^~~~~~~~
> > > > In file included from include/linux/radix-tree.h:31,
> > > >                  from include/linux/idr.h:15,
> > > >                  from include/drm/drm_device.h:7,
> > > >                  from drivers/gpu/drm/lima/lima_device.h:7,
> > > >                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > > include/linux/xarray.h:817:9: note: expected 'void *' but argument is of type 'unsigned int'
> > > >    void *entry, struct xa_limit limit, gfp_t gfp)
> > > >    ~~~~~~^~~~~
> > > > drivers/gpu/drm/lima/lima_ctx.c:26:46: error: incompatible type for argument 4 of 'xa_alloc'
> > > >   err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > >                                               ^~~
> > > > In file included from include/linux/radix-tree.h:31,
> > > >                  from include/linux/idr.h:15,
> > > >                  from include/drm/drm_device.h:7,
> > > >                  from drivers/gpu/drm/lima/lima_device.h:7,
> > > >                  from drivers/gpu/drm/lima/lima_ctx.c:6:
> > > > include/linux/xarray.h:817:32: note: expected 'struct xa_limit' but argument is of type 'struct lima_ctx *'
> > > >    void *entry, struct xa_limit limit, gfp_t gfp)
> > > >                 ~~~~~~~~~~~~~~~~^~~~~
> > > >
> > > > Caused by commit
> > > >
> > > >   a1d2a6339961 ("drm/lima: driver for ARM Mali4xx GPUs")
> > > >
> > > > interacting with commit
> > > >
> > > >   a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
> > > >
> > > > from Linus' tree (v5.1-rc1).
> > > >
> > > > I have applied the following patch for today.  It could be applied as
> > > > part of a merge of v5.1-rc1 into drm-misc.
> > > >
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Tue, 2 Apr 2019 10:45:32 +1100
> > > > Subject: [PATCH] drm/lima: update for xa_alloc API change
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > ---
> > > >  drivers/gpu/drm/lima/lima_ctx.c | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/lima/lima_ctx.c b/drivers/gpu/drm/lima/lima_ctx.c
> > > > index c8d12f7c6894..bafa00d74cc5 100644
> > > > --- a/drivers/gpu/drm/lima/lima_ctx.c
> > > > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > > > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> > > >                         goto err_out0;
> > > >         }
> > > >
> > > > -       err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > > +       err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> > > >         if (err < 0)
> > > >                 goto err_out0;
> > > >
> > > > --
> > > > 2.20.1
> > > >
> > > > --
> > > > Cheers,
> > > > Stephen Rothwell
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Matthew Wilcox]

On Tue, Apr 02, 2019 at 10:50:06AM +1100, Stephen Rothwell wrote:
> +++ b/drivers/gpu/drm/lima/lima_ctx.c
> @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
>  			goto err_out0;
>  	}
>  
> -	err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> +	err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
>  	if (err < 0)
>  		goto err_out0;

I agree that this is an exact translation of what the code was doing,
but I don't think it's what the author intended the code to do.
They almost certainly meant:

	err = xa_alloc(&mgr->handles, id, ctx, xa_limit_32b, GFP_KERNEL);

I'm basing this on:

+struct drm_lima_ctx_create {
+       __u32 id;          /* out, context handle */
+       __u32 _pad;        /* pad, must be zero */
+};

(and this confusion is exactly why I changed the API ...)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Matthew Wilcox]

On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> Thanks, patch is:
> Reviewed-by: Qiang Yu <yuq825@gmail.com>

This looks like a fairly naive conversion from the old IDR API to the
XArray API.  You should be able to remove mgr->lock entirely, relying on
the xa_lock for synchronising free and get.  If you think it's worth it,
you could even use kfree_rcu() to free the ctx and kref_get_unless_zero()
and then your get path would be lock-free.

Re: linux-next: build failure after merge of the drm-misc tree

[Qiang Yu]

On Tue, Apr 2, 2019 at 7:21 PM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Tue, Apr 02, 2019 at 10:50:06AM +1100, Stephen Rothwell wrote:
> > +++ b/drivers/gpu/drm/lima/lima_ctx.c
> > @@ -23,7 +23,7 @@ int lima_ctx_create(struct lima_device *dev, struct lima_ctx_mgr *mgr, u32 *id)
> >                       goto err_out0;
> >       }
> >
> > -     err = xa_alloc(&mgr->handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > +     err = xa_alloc(&mgr->handles, id, ctx, XA_LIMIT(*id, UINT_MAX), GFP_KERNEL);
> >       if (err < 0)
> >               goto err_out0;
>
> I agree that this is an exact translation of what the code was doing,
> but I don't think it's what the author intended the code to do.
> They almost certainly meant:
>
>         err = xa_alloc(&mgr->handles, id, ctx, xa_limit_32b, GFP_KERNEL);
>
> I'm basing this on:
>
> +struct drm_lima_ctx_create {
> +       __u32 id;          /* out, context handle */
> +       __u32 _pad;        /* pad, must be zero */
> +};
>
> (and this confusion is exactly why I changed the API ...)

Right, I plan to send out a patch like yours after drm-misc-next merge
5.1 changes, as this is a build fix patch and already applied to somewhere.
I can send out another patch now if merge guys could use the new one
directly.

Re: linux-next: build failure after merge of the drm-misc tree

[Qiang Yu]

On Tue, Apr 2, 2019 at 7:26 PM Matthew Wilcox <willy@infradead.org> wrote:
>
> On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > Thanks, patch is:
> > Reviewed-by: Qiang Yu <yuq825@gmail.com>
>
> This looks like a fairly naive conversion from the old IDR API to the
> XArray API.  You should be able to remove mgr->lock entirely, relying on
> the xa_lock for synchronising free and get.

I'm afraid the a little complex free path may involve some might sleep
functions so use a mutex lock instead of spinlock.

> If you think it's worth it,
> you could even use kfree_rcu() to free the ctx and kref_get_unless_zero()
> and then your get path would be lock-free.

I can take a look this way, thanks.

Re: linux-next: build failure after merge of the drm-misc tree

[Matthew Wilcox]

On Tue, Apr 02, 2019 at 09:56:08PM +0800, Qiang Yu wrote:
> On Tue, Apr 2, 2019 at 7:26 PM Matthew Wilcox <willy@infradead.org> wrote:
> >
> > On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > > Thanks, patch is:
> > > Reviewed-by: Qiang Yu <yuq825@gmail.com>
> >
> > This looks like a fairly naive conversion from the old IDR API to the
> > XArray API.  You should be able to remove mgr->lock entirely, relying on
> > the xa_lock for synchronising free and get.
> 
> I'm afraid the a little complex free path may involve some might sleep
> functions so use a mutex lock instead of spinlock.

Ah, good call ...

+       mutex_lock(&mgr->lock);
+       ctx = xa_erase(&mgr->handles, id);
+       if (ctx)
+               kref_put(&ctx->refcnt, lima_ctx_do_release);
+       else
+               ret = -EINVAL;
+       mutex_unlock(&mgr->lock);

+static void lima_ctx_do_release(struct kref *ref)
+{
+       struct lima_ctx *ctx = container_of(ref, struct lima_ctx, refcnt);
+       int i;
+
+       for (i = 0; i < lima_pipe_num; i++)
+               lima_sched_context_fini(ctx->dev->pipe + i, ctx->context + i);
+       kfree(ctx);
+}

+void lima_sched_context_fini(struct lima_sched_pipe *pipe,
+                            struct lima_sched_context *context)
+{
+       drm_sched_entity_fini(&context->base);
+}

and drm_sched_entity_fini() can call kthread_park(), which does sleep.

> > If you think it's worth it,
> > you could even use kfree_rcu() to free the ctx and kref_get_unless_zero()
> > and then your get path would be lock-free.
> 
> I can take a look this way, thanks.

I think that's the only way you can get rid of the mutex, given the
sleeping functions called in the free path.

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

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

kernel/dma/contiguous.c:19:10: fatal error: asm/dma-contiguous.h: No such file or directory
 #include <asm/dma-contiguous.h>
          ^~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  4f2a8f5898ec ("drm: Add ASPEED GFX driver")

I have disabled that driver for today (by making it depend on BROKEN).



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 609 bytes --]

Hi Dave,

On Fri, 5 Apr 2019 15:55:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> kernel/dma/contiguous.c:19:10: fatal error: asm/dma-contiguous.h: No such file or directory
>  #include <asm/dma-contiguous.h>
>           ^~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   4f2a8f5898ec ("drm: Add ASPEED GFX driver")
> 
> I have disabled that driver for today (by making it depend on BROKEN).

I noticed that this is now in the drm tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 2308 bytes --]

Hi all,

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

drivers/gpu/drm/cirrus/cirrus.c: In function 'cirrus_fb_blit_rect':
drivers/gpu/drm/cirrus/cirrus.c:310:25: error: implicit declaration of function '__io_virt'; did you mean '__do_irq'? [-Werror=implicit-function-declaration]
   drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
                         ^~~~~~~~~
                         __do_irq
drivers/gpu/drm/cirrus/cirrus.c:310:25: warning: passing argument 1 of 'drm_fb_memcpy_dstclip' makes pointer from integer without a cast [-Wint-conversion]
   drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
                         ^~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/cirrus/cirrus.c:33:
include/drm/drm_format_helper.h:18:34: note: expected 'void *' but argument is of type 'int'
 void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb,
                            ~~~~~~^~~
drivers/gpu/drm/cirrus/cirrus.c:314:37: warning: passing argument 1 of 'drm_fb_xrgb8888_to_rgb565_dstclip' makes pointer from integer without a cast [-Wint-conversion]
   drm_fb_xrgb8888_to_rgb565_dstclip(__io_virt(cirrus->vram),
                                     ^~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/cirrus/cirrus.c:33:
include/drm/drm_format_helper.h:25:46: note: expected 'void *' but argument is of type 'int'
 void drm_fb_xrgb8888_to_rgb565_dstclip(void *dst, unsigned int dst_pitch,
                                        ~~~~~~^~~
drivers/gpu/drm/cirrus/cirrus.c:319:37: warning: passing argument 1 of 'drm_fb_xrgb8888_to_rgb888_dstclip' makes pointer from integer without a cast [-Wint-conversion]
   drm_fb_xrgb8888_to_rgb888_dstclip(__io_virt(cirrus->vram),
                                     ^~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/cirrus/cirrus.c:33:
include/drm/drm_format_helper.h:28:46: note: expected 'void *' but argument is of type 'int'
 void drm_fb_xrgb8888_to_rgb888_dstclip(void *dst, unsigned int dst_pitch,
                                        ~~~~~~^~~

Caused by commit

  ab3e023b1b4c ("drm/cirrus: rewrite and modernize driver.")

I have marked that driver BROKEN for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the drm-misc tree

[Gerd Hoffmann]

On Tue, Apr 09, 2019 at 04:08:49PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/cirrus/cirrus.c: In function 'cirrus_fb_blit_rect':
> drivers/gpu/drm/cirrus/cirrus.c:310:25: error: implicit declaration of function '__io_virt'; did you mean '__do_irq'? [-Werror=implicit-function-declaration]
>    drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
>                          ^~~~~~~~~
>                          __do_irq

Probably just a missing arm/io.h include.
Test build is running ...

cheers,
  Gerd

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi Gerd,

On Tue, 9 Apr 2019 09:22:18 +0200 Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> On Tue, Apr 09, 2019 at 04:08:49PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the drm-misc tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/gpu/drm/cirrus/cirrus.c: In function 'cirrus_fb_blit_rect':
> > drivers/gpu/drm/cirrus/cirrus.c:310:25: error: implicit declaration of function '__io_virt'; did you mean '__do_irq'? [-Werror=implicit-function-declaration]
> >    drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
> >                          ^~~~~~~~~
> >                          __do_irq  
> 
> Probably just a missing arm/io.h include.

I assume you meant asm/io.h?

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Gerd Hoffmann]

On Tue, Apr 09, 2019 at 06:08:55PM +1000, Stephen Rothwell wrote:
> Hi Gerd,
> 
> > >    drm_fb_memcpy_dstclip(__io_virt(cirrus->vram),
> > >                          ^~~~~~~~~
> > >                          __do_irq  
> > 
> > Probably just a missing arm/io.h include.
> 
> I assume you meant asm/io.h?

Yes.

cheers,
  Gerd

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 2222 bytes --]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: error: initialization of 'int (*)(struct drm_connector *, struct drm_atomic_state *)' from incompatible pointer type 'int (*)(struct drm_connector *, struct drm_connector_state *)' [-Werror=incompatible-pointer-types]
  .atomic_check = amdgpu_dm_connector_atomic_check,
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: note: (near initialization for 'amdgpu_dm_connector_helper_funcs.atomic_check')

Caused by commit

  6f3b62781bbd ("drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state")

interacting with commit

  88694af9e4d1 ("drm/amd/display: Expose HDR output metadata for supported connectors")

from the drm tree.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Jun 2019 14:27:12 +1000
Subject: [PATCH] fixup for "drm: Convert connector_helper_funcs->atomic_check
 to accept drm_atomic_state"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 413bf22e9585..b3a083c9a11c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3976,9 +3976,10 @@ is_hdr_metadata_different(const struct drm_connector_state *old_state,
 
 static int
 amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
-				 struct drm_connector_state *new_con_state)
+				 struct drm_atomic_state *state)
 {
-	struct drm_atomic_state *state = new_con_state->state;
+	struct drm_connector_state *new_con_state =
+		drm_atomic_get_new_connector_state(state, conn);
 	struct drm_connector_state *old_con_state =
 		drm_atomic_get_old_connector_state(state, conn);
 	struct drm_crtc *crtc = new_con_state->crtc;
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 704 bytes --]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/radeon/radeon_connectors.c: In function 'radeon_add_legacy_connector':
drivers/gpu/drm/radeon/radeon_connectors.c:2433:5: error: 'ddc' undeclared (first use in this function)
     ddc = &radeon_connector->ddc_bus->adapter;
     ^~~
drivers/gpu/drm/radeon/radeon_connectors.c:2433:5: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  bed7a2182de6 ("drm/radeon: Provide ddc symlink in connector sysfs directory")

I have used the drm-misc tree from next-20190731 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 2305 bytes --]

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c: In function 'amdgpu_bo_release_notify':
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1245:28: error: 'struct ttm_buffer_object' has no member named 'resv'
  reservation_object_lock(bo->resv, NULL);
                            ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1247:47: error: 'struct ttm_buffer_object' has no member named 'resv'
  r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
                                               ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1253:30: error: 'struct ttm_buffer_object' has no member named 'resv'
  reservation_object_unlock(bo->resv);
                              ^~

Caused by commit

  5a5011a72489 ("drm/amdgpu: switch driver from bo->resv to bo->base.resv")

interacting with commit

  ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release")

from the amdgpu tree.

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Aug 2019 13:17:54 +1000
Subject: [PATCH] drm/amdgpu: fix up for "drm/amdgpu: switch driver from bo->resv to bo->base.resv"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index b2c03be51c29..2d07f16f1789 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1242,15 +1242,15 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
 	    !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE))
 		return;
 
-	reservation_object_lock(bo->resv, NULL);
+	reservation_object_lock(bo->base.resv, NULL);
 
-	r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
+	r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence);
 	if (!WARN_ON(r)) {
 		amdgpu_bo_fence(abo, fence, false);
 		dma_fence_put(fence);
 	}
 
-	reservation_object_unlock(bo->resv);
+	reservation_object_unlock(bo->base.resv);
 }
 
 /**
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 1356 bytes --]

Hi all,

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

drivers/gpu/drm/virtio/virtgpu_object.c:31:67: error: expected ')' before 'int'
 module_param_named(virglhack, virtio_gpu_virglrenderer_workaround, int, 0400);
                                                                   ^~~~
                                                                   )

Caused by commit

  3e93bc2a58aa ("drm/virtio: make resource id workaround runtime switchable.")

I applied the following fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Aug 2019 18:37:40 +1000
Subject: [PATCH] drm/virtio: module_param_named() requires linux/moduleparam.h

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

diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
index aab5534056ec..b5f8923ac674 100644
--- a/drivers/gpu/drm/virtio/virtgpu_object.c
+++ b/drivers/gpu/drm/virtio/virtgpu_object.c
@@ -23,6 +23,8 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <linux/moduleparam.h>
+
 #include <drm/ttm/ttm_execbuf_util.h>
 
 #include "virtgpu_drv.h"
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the drm-misc tree

[Gerd Hoffmann]

> I applied the following fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 28 Aug 2019 18:37:40 +1000
> Subject: [PATCH] drm/virtio: module_param_named() requires linux/moduleparam.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/virtio/virtgpu_object.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
> index aab5534056ec..b5f8923ac674 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_object.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
> @@ -23,6 +23,8 @@
>   * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>   */
>  
> +#include <linux/moduleparam.h>
> +

Fix pushed to drm-misc-next.

thanks,
  Gerd

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:


Caused by commit

  10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")

interacting with commit

  7e86efa2ff03 ("media: cec-gpio: add notifier support")

form the v4l-dvb tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 8 Oct 2019 10:26:05 +1100
Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
 cec_notifier_cec_adap_unregister()"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
index 7be91e712c4a..42d2c2cd9a78 100644
--- a/drivers/media/platform/cec-gpio/cec-gpio.c
+++ b/drivers/media/platform/cec-gpio/cec-gpio.c
@@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
 	return 0;
 
 unreg_notifier:
-	cec_notifier_cec_adap_unregister(cec->notifier);
+	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
 del_adap:
 	cec_delete_adapter(cec->adap);
 	return ret;
@@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
 {
 	struct cec_gpio *cec = platform_get_drvdata(pdev);
 
-	cec_notifier_cec_adap_unregister(cec->notifier);
+	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
 	cec_unregister_adapter(cec->adap);
 	return 0;
 }
-- 
2.23.0.rc1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 

Sorry, forgot to include the error messages. But they shuld be clear
from the fix ...

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Hans Verkuil]

On 10/8/19 1:30 AM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> 
> Caused by commit
> 
>   10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
> 
> interacting with commit
> 
>   7e86efa2ff03 ("media: cec-gpio: add notifier support")
> 
> form the v4l-dvb tree.
> 
> I have applied the following merge fix patch.

That's the correct fix, thank you!

Regards,

	Hans

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
>  cec_notifier_cec_adap_unregister()"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
>  	return 0;
>  
>  unreg_notifier:
> -	cec_notifier_cec_adap_unregister(cec->notifier);
> +	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
>  del_adap:
>  	cec_delete_adapter(cec->adap);
>  	return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
>  {
>  	struct cec_gpio *cec = platform_get_drvdata(pdev);
>  
> -	cec_notifier_cec_adap_unregister(cec->notifier);
> +	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
>  	cec_unregister_adapter(cec->adap);
>  	return 0;
>  }
> 

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_module.c:25:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
   40 | #include <drm/drmP.h>
      |          ^~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
   40 | #include <drm/drmP.h>
      |          ^~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
   40 | #include <drm/drmP.h>
      |          ^~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34:
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
   40 | #include <drm/drmP.h>
      |          ^~~~~~~~~~~~


Caused by commit

  4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")

interacting with commit

  6b855f7b83d2 ("drm/amdkfd: Check against device cgroup")

from the amdgpu tree.

I added the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 9 Oct 2019 11:24:38 +1100
Subject: [PATCH] drm/amdkfd: update for drmP.h removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index b8b4485c8f74..41bc0428bfc0 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -37,7 +37,9 @@
 #include <linux/kref.h>
 #include <linux/sysfs.h>
 #include <linux/device_cgroup.h>
-#include <drm/drmP.h>
+#include <drm/drm_file.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_device.h>
 #include <kgd_kfd_interface.h>
 
 #include "amd_shared.h"
@@ -49,8 +51,6 @@
 /* GPU ID hash width in bits */
 #define KFD_GPU_ID_HASH_WIDTH 16
 
-struct drm_device;
-
 /* Use upper bits of mmap offset to store KFD driver specific information.
  * BITS[63:62] - Encode MMAP type
  * BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs to
-- 
2.23.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Alex Deucher]

Applied.  thanks!

Alex

On Tue, Oct 8, 2019 at 8:36 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_module.c:25:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
>    40 | #include <drm/drmP.h>
>       |          ^~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_chardev.c:38:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
>    40 | #include <drm/drmP.h>
>       |          ^~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_device.c:26:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
>    40 | #include <drm/drmP.h>
>       |          ^~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:34:
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_priv.h:40:10: fatal error: drm/drmP.h: No such file or directory
>    40 | #include <drm/drmP.h>
>       |          ^~~~~~~~~~~~
>
>
> Caused by commit
>
>   4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
>
> interacting with commit
>
>   6b855f7b83d2 ("drm/amdkfd: Check against device cgroup")
>
> from the amdgpu tree.
>
> I added the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 9 Oct 2019 11:24:38 +1100
> Subject: [PATCH] drm/amdkfd: update for drmP.h removal
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> index b8b4485c8f74..41bc0428bfc0 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> @@ -37,7 +37,9 @@
>  #include <linux/kref.h>
>  #include <linux/sysfs.h>
>  #include <linux/device_cgroup.h>
> -#include <drm/drmP.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_device.h>
>  #include <kgd_kfd_interface.h>
>
>  #include "amd_shared.h"
> @@ -49,8 +51,6 @@
>  /* GPU ID hash width in bits */
>  #define KFD_GPU_ID_HASH_WIDTH 16
>
> -struct drm_device;
> -
>  /* Use upper bits of mmap offset to store KFD driver specific information.
>   * BITS[63:62] - Encode MMAP type
>   * BITS[61:46] - Encode gpu_id. To identify to which GPU the offset belongs to
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 2938 bytes --]

Hi all,

This is now a semantic conflict between the drm and v4l-dvb trees.

On Tue, 8 Oct 2019 10:30:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_probe':
drivers/media/platform/cec-gpio/cec-gpio.c:262:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
  262 |  cec_notifier_cec_adap_unregister(cec->notifier);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
   98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/media/platform/cec-gpio/cec-gpio.c: In function 'cec_gpio_remove':
drivers/media/platform/cec-gpio/cec-gpio.c:272:2: error: too few arguments to function 'cec_notifier_cec_adap_unregister'
  272 |  cec_notifier_cec_adap_unregister(cec->notifier);
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/media/platform/cec-gpio/cec-gpio.c:11:
include/media/cec-notifier.h:98:6: note: declared here
   98 | void cec_notifier_cec_adap_unregister(struct cec_notifier *n,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

> Caused by commit
> 
>   10d8f308ba3e ("cec: add cec_adapter to cec_notifier_cec_adap_unregister()")
> 
> interacting with commit
> 
>   7e86efa2ff03 ("media: cec-gpio: add notifier support")
> 
> form the v4l-dvb tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 8 Oct 2019 10:26:05 +1100
> Subject: [PATCH] cec: fix up for "cec: add cec_adapter to
>  cec_notifier_cec_adap_unregister()"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/platform/cec-gpio/cec-gpio.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/cec-gpio/cec-gpio.c b/drivers/media/platform/cec-gpio/cec-gpio.c
> index 7be91e712c4a..42d2c2cd9a78 100644
> --- a/drivers/media/platform/cec-gpio/cec-gpio.c
> +++ b/drivers/media/platform/cec-gpio/cec-gpio.c
> @@ -259,7 +259,7 @@ static int cec_gpio_probe(struct platform_device *pdev)
>  	return 0;
>  
>  unreg_notifier:
> -	cec_notifier_cec_adap_unregister(cec->notifier);
> +	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
>  del_adap:
>  	cec_delete_adapter(cec->adap);
>  	return ret;
> @@ -269,7 +269,7 @@ static int cec_gpio_remove(struct platform_device *pdev)
>  {
>  	struct cec_gpio *cec = platform_get_drvdata(pdev);
>  
> -	cec_notifier_cec_adap_unregister(cec->notifier);
> +	cec_notifier_cec_adap_unregister(cec->notifier, cec->adap);
>  	cec_unregister_adapter(cec->adap);
>  	return 0;
>  }

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c:23:10: fatal error: drm/drmP.h: No such file or directory
   23 | #include <drm/drmP.h>
      |          ^~~~~~~~~~~~

Caused by commit

  4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")

interacting with commit

  8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)")

from the amdgpu tree.

I applied the following merge fix patch for today (which should also
apply to the amdgpu tree).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Oct 2019 11:17:32 +1100
Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
index 14a55003dd81..823527a0fa47 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
@@ -20,7 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
+#include <linux/device.h>
+
+#include <drm/amd_asic_type.h>
+
 #include "amdgpu.h"
 #include "amdgpu_tmz.h"
 
-- 
2.23.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Alex Deucher]

Applied.  Thanks!

Alex

On Tue, Oct 15, 2019 at 8:22 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c:23:10: fatal error: drm/drmP.h: No such file or directory
>    23 | #include <drm/drmP.h>
>       |          ^~~~~~~~~~~~
>
> Caused by commit
>
>   4e98f871bcff ("drm: delete drmP.h + drm_os_linux.h")
>
> interacting with commit
>
>   8b8c294c5d37 ("drm/amdgpu: add function to check tmz capability (v4)")
>
> from the amdgpu tree.
>
> I applied the following merge fix patch for today (which should also
> apply to the amdgpu tree).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 Oct 2019 11:17:32 +1100
> Subject: [PATCH] drm/amdgpu: fix up for amdgpu_tmz.c and removal of drm/drmP.h
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> index 14a55003dd81..823527a0fa47 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_tmz.c
> @@ -20,7 +20,10 @@
>   * OTHER DEALINGS IN THE SOFTWARE.
>   */
>
> -#include <drm/drmP.h>
> +#include <linux/device.h>
> +
> +#include <drm/amd_asic_type.h>
> +
>  #include "amdgpu.h"
>  #include "amdgpu_tmz.h"
>
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:


Caused by commit

  a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")

interacting with commit

  dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")

(and maybe others) from Linus' tree (v6.8-rc1).

I have applied the following merge fix patch for today.  This makes it build,
but more is likely needed ...

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Feb 2024 12:21:07 +1100
Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6"

interacting with commit

  dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/xe/xe_bo.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 0b0e262e2166..280dbda8ae5a 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -38,8 +38,6 @@ static const struct ttm_place sys_placement_flags = {
 static struct ttm_placement sys_placement = {
 	.num_placement = 1,
 	.placement = &sys_placement_flags,
-	.num_busy_placement = 1,
-	.busy_placement = &sys_placement_flags,
 };
 
 static const struct ttm_place tt_placement_flags = {
@@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags = {
 static struct ttm_placement tt_placement = {
 	.num_placement = 1,
 	.placement = &tt_placement_flags,
-	.num_busy_placement = 1,
-	.busy_placement = &sys_placement_flags,
 };
 
 bool mem_type_is_vram(u32 mem_type)
@@ -230,8 +226,6 @@ static int __xe_bo_placement_for_flags(struct xe_device *xe, struct xe_bo *bo,
 	bo->placement = (struct ttm_placement) {
 		.num_placement = c,
 		.placement = bo->placements,
-		.num_busy_placement = c,
-		.busy_placement = bo->placements,
 	};
 
 	return 0;
@@ -251,7 +245,6 @@ static void xe_evict_flags(struct ttm_buffer_object *tbo,
 		/* Don't handle scatter gather BOs */
 		if (tbo->type == ttm_bo_type_sg) {
 			placement->num_placement = 0;
-			placement->num_busy_placement = 0;
 			return;
 		}
 
@@ -1353,8 +1346,6 @@ static int __xe_bo_fixed_placement(struct xe_device *xe,
 	bo->placement = (struct ttm_placement) {
 		.num_placement = 1,
 		.placement = place,
-		.num_busy_placement = 1,
-		.busy_placement = place,
 	};
 
 	return 0;
@@ -2112,9 +2103,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32 mem_type)
 
 	xe_place_from_ttm_type(mem_type, &requested);
 	placement.num_placement = 1;
-	placement.num_busy_placement = 1;
 	placement.placement = &requested;
-	placement.busy_placement = &requested;
 
 	/*
 	 * Stolen needs to be handled like below VRAM handling if we ever need
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (i386 defconfig)
failed like this:

In function 'i915_ttm_placement_from_obj',
    inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
  165 |         places[0].flags |= TTM_PL_FLAG_DESIRED;
      |         ~~~~~~~~~^~~~~~
drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
  837 |         struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
      |                          ^~~~~~

Caused by commit

  a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")

I applied the following hack for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Feb 2024 15:17:54 +1100
Subject: [PATCH] drm/ttm: initialise places

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 80c6cafc8887..34e699e67c25 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
 
 static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
 {
-	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
+	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
 	struct ttm_placement placement;
 
 	/* restricted by sg_alloc_table */
-- 
2.43.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Jani Nikula]

On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
>
> Caused by commit
>
>   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>
> interacting with commit
>
>   dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> (and maybe others) from Linus' tree (v6.8-rc1).
>
> I have applied the following merge fix patch for today.  This makes it build,
> but more is likely needed ...
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 12:21:07 +1100
> Subject: [PATCH] fix up for "drm/ttm: replace busy placement with flags v6"
>
> interacting with commit
>
>   dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/xe/xe_bo.c | 11 -----------
>  1 file changed, 11 deletions(-)

Please see the new MAINTAINERS entry for drm/xe changes:

INTEL DRM XE DRIVER (Lunar Lake and newer)
M:	Lucas De Marchi <lucas.demarchi@intel.com>
M:	Oded Gabbay <ogabbay@kernel.org>
M:	Thomas Hellström <thomas.hellstrom@linux.intel.com>
L:	intel-xe@lists.freedesktop.org

BR,
Jani.


-- 
Jani Nikula, Intel

Re: linux-next: build failure after merge of the drm-misc tree

[Thomas Hellström]

Hi

On Tue, 2024-02-06 at 12:28 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> 
> Caused by commit
> 
>   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> 
> interacting with commit
> 
>   dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
> 
> (and maybe others) from Linus' tree (v6.8-rc1).
> 
> I have applied the following merge fix patch for today.  This makes
> it build,
> but more is likely needed ...

There was a manual fixup for the drm-misc-next merge into drm-tip that
did the right thing here.

How do we ensure these are included into the linux-next builds?

Thanks,
Thomas



> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 12:21:07 +1100
> Subject: [PATCH] fix up for "drm/ttm: replace busy placement with
> flags v6"
> 
> interacting with commit
> 
>   dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/xe/xe_bo.c | 11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index 0b0e262e2166..280dbda8ae5a 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -38,8 +38,6 @@ static const struct ttm_place sys_placement_flags =
> {
>  static struct ttm_placement sys_placement = {
>  	.num_placement = 1,
>  	.placement = &sys_placement_flags,
> -	.num_busy_placement = 1,
> -	.busy_placement = &sys_placement_flags,
>  };
>  
>  static const struct ttm_place tt_placement_flags = {
> @@ -52,8 +50,6 @@ static const struct ttm_place tt_placement_flags =
> {
>  static struct ttm_placement tt_placement = {
>  	.num_placement = 1,
>  	.placement = &tt_placement_flags,
> -	.num_busy_placement = 1,
> -	.busy_placement = &sys_placement_flags,
>  };
>  
>  bool mem_type_is_vram(u32 mem_type)
> @@ -230,8 +226,6 @@ static int __xe_bo_placement_for_flags(struct
> xe_device *xe, struct xe_bo *bo,
>  	bo->placement = (struct ttm_placement) {
>  		.num_placement = c,
>  		.placement = bo->placements,
> -		.num_busy_placement = c,
> -		.busy_placement = bo->placements,
>  	};
>  
>  	return 0;
> @@ -251,7 +245,6 @@ static void xe_evict_flags(struct
> ttm_buffer_object *tbo,
>  		/* Don't handle scatter gather BOs */
>  		if (tbo->type == ttm_bo_type_sg) {
>  			placement->num_placement = 0;
> -			placement->num_busy_placement = 0;
>  			return;
>  		}
>  
> @@ -1353,8 +1346,6 @@ static int __xe_bo_fixed_placement(struct
> xe_device *xe,
>  	bo->placement = (struct ttm_placement) {
>  		.num_placement = 1,
>  		.placement = place,
> -		.num_busy_placement = 1,
> -		.busy_placement = place,
>  	};
>  
>  	return 0;
> @@ -2112,9 +2103,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32
> mem_type)
>  
>  	xe_place_from_ttm_type(mem_type, &requested);
>  	placement.num_placement = 1;
> -	placement.num_busy_placement = 1;
>  	placement.placement = &requested;
> -	placement.busy_placement = &requested;
>  
>  	/*
>  	 * Stolen needs to be handled like below VRAM handling if we
> ever need
> -- 
> 2.43.0
> 

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

On Tue, 6 Feb 2024 12:28:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

drivers/gpu/drm/xe/xe_bo.c:41:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
   41 |         .num_busy_placement = 1,
      |          ^~~~~~~~~~~~~~~~~~
      |          num_placement
drivers/gpu/drm/xe/xe_bo.c:41:31: error: excess elements in struct initializer [-Werror]
   41 |         .num_busy_placement = 1,
      |                               ^
drivers/gpu/drm/xe/xe_bo.c:41:31: note: (near initialization for 'sys_placement')
drivers/gpu/drm/xe/xe_bo.c:42:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
   42 |         .busy_placement = &sys_placement_flags,
      |          ^~~~~~~~~~~~~~
      |          num_placement
drivers/gpu/drm/xe/xe_bo.c:42:27: error: excess elements in struct initializer [-Werror]
   42 |         .busy_placement = &sys_placement_flags,
      |                           ^
drivers/gpu/drm/xe/xe_bo.c:42:27: note: (near initialization for 'sys_placement')
drivers/gpu/drm/xe/xe_bo.c:55:10: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
   55 |         .num_busy_placement = 1,
      |          ^~~~~~~~~~~~~~~~~~
      |          num_placement
drivers/gpu/drm/xe/xe_bo.c:55:31: error: excess elements in struct initializer [-Werror]
   55 |         .num_busy_placement = 1,
      |                               ^
drivers/gpu/drm/xe/xe_bo.c:55:31: note: (near initialization for 'tt_placement')
drivers/gpu/drm/xe/xe_bo.c:56:10: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
   56 |         .busy_placement = &sys_placement_flags,
      |          ^~~~~~~~~~~~~~
      |          num_placement
drivers/gpu/drm/xe/xe_bo.c:56:27: error: excess elements in struct initializer [-Werror]
   56 |         .busy_placement = &sys_placement_flags,
      |                           ^
drivers/gpu/drm/xe/xe_bo.c:56:27: note: (near initialization for 'tt_placement')
drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_placement_for_flags':
drivers/gpu/drm/xe/xe_bo.c:233:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
  233 |                 .num_busy_placement = c,
      |                  ^~~~~~~~~~~~~~~~~~
      |                  num_placement
drivers/gpu/drm/xe/xe_bo.c:233:39: error: excess elements in struct initializer [-Werror]
  233 |                 .num_busy_placement = c,
      |                                       ^
drivers/gpu/drm/xe/xe_bo.c:233:39: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c:234:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
  234 |                 .busy_placement = bo->placements,
      |                  ^~~~~~~~~~~~~~
      |                  num_placement
drivers/gpu/drm/xe/xe_bo.c:234:35: error: excess elements in struct initializer [-Werror]
  234 |                 .busy_placement = bo->placements,
      |                                   ^~
drivers/gpu/drm/xe/xe_bo.c:234:35: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c: In function 'xe_evict_flags':
drivers/gpu/drm/xe/xe_bo.c:254:36: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
  254 |                         placement->num_busy_placement = 0;
      |                                    ^~~~~~~~~~~~~~~~~~
      |                                    num_placement
drivers/gpu/drm/xe/xe_bo.c: In function '__xe_bo_fixed_placement':
drivers/gpu/drm/xe/xe_bo.c:1356:18: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
 1356 |                 .num_busy_placement = 1,
      |                  ^~~~~~~~~~~~~~~~~~
      |                  num_placement
drivers/gpu/drm/xe/xe_bo.c:1356:39: error: excess elements in struct initializer [-Werror]
 1356 |                 .num_busy_placement = 1,
      |                                       ^
drivers/gpu/drm/xe/xe_bo.c:1356:39: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c:1357:18: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
 1357 |                 .busy_placement = place,
      |                  ^~~~~~~~~~~~~~
      |                  num_placement
drivers/gpu/drm/xe/xe_bo.c:1357:35: error: excess elements in struct initializer [-Werror]
 1357 |                 .busy_placement = place,
      |                                   ^~~~~
drivers/gpu/drm/xe/xe_bo.c:1357:35: note: (near initialization for '(anonymous)')
drivers/gpu/drm/xe/xe_bo.c: In function 'xe_bo_migrate':
drivers/gpu/drm/xe/xe_bo.c:2115:19: error: 'struct ttm_placement' has no member named 'num_busy_placement'; did you mean 'num_placement'?
 2115 |         placement.num_busy_placement = 1;
      |                   ^~~~~~~~~~~~~~~~~~
      |                   num_placement
drivers/gpu/drm/xe/xe_bo.c:2117:19: error: 'struct ttm_placement' has no member named 'busy_placement'; did you mean 'num_placement'?
 2117 |         placement.busy_placement = &requested;
      |                   ^~~~~~~~~~~~~~
      |                   num_placement

> Caused by commit
> 
>   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> 
> interacting with commit
> 
>   dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs")
> 
> (and maybe others) from Linus' tree (v6.8-rc1).

Given that the latter above commit(s) are also in the drm-misc tree, I
have just used the drm-misc tree from next-20240205 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

On Tue, 6 Feb 2024 15:28:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> failed like this:
> 
> In function 'i915_ttm_placement_from_obj',
>     inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
>   165 |         places[0].flags |= TTM_PL_FLAG_DESIRED;
>       |         ~~~~~~~~~^~~~~~
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
>   837 |         struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
>       |                          ^~~~~~
> 
> Caused by commit
> 
>   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
> 
> I applied the following hack for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 15:17:54 +1100
> Subject: [PATCH] drm/ttm: initialise places
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 80c6cafc8887..34e699e67c25 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
>  
>  static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
>  {
> -	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> +	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
>  	struct ttm_placement placement;
>  
>  	/* restricted by sg_alloc_table */
> -- 
> 2.43.0

I am still applying the above patch :-(

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of function 'drm_debug_printer'; did you mean 'drm_dbg_printer'? [-Werror=implicit-function-declaration]
  191 |         struct drm_printer p = drm_debug_printer(test->name);
      |                                ^~~~~~~~~~~~~~~~~
      |                                drm_dbg_printer
drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
cc1: all warnings being treated as errors

Caused by commit

  e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")

I have used the drm-misc tree from next-20240209 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Jani Nikula]

On Mon, 12 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of function 'drm_debug_printer'; did you mean 'drm_dbg_printer'? [-Werror=implicit-function-declaration]
>   191 |         struct drm_printer p = drm_debug_printer(test->name);
>       |                                ^~~~~~~~~~~~~~~~~
>       |                                drm_dbg_printer
> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
> cc1: all warnings being treated as errors
>
> Caused by commit
>
>   e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
>
> I have used the drm-misc tree from next-20240209 for today.

Fix at [1].

BR,
Jani.


[1] https://lore.kernel.org/r/20240209140818.106685-1-michal.winiarski@intel.com


-- 
Jani Nikula, Intel

Re: linux-next: build failure after merge of the drm-misc tree

[Jani Nikula]

On Mon, 12 Feb 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> On Mon, 12 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> After merging the drm-misc tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/tests/drm_mm_test.c: In function 'drm_test_mm_debug':
>> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: implicit declaration of function 'drm_debug_printer'; did you mean 'drm_dbg_printer'? [-Werror=implicit-function-declaration]
>>   191 |         struct drm_printer p = drm_debug_printer(test->name);
>>       |                                ^~~~~~~~~~~~~~~~~
>>       |                                drm_dbg_printer
>> drivers/gpu/drm/tests/drm_mm_test.c:191:32: error: invalid initializer
>> cc1: all warnings being treated as errors
>>
>> Caused by commit
>>
>>   e154c4fc7bf2 ("drm: remove drm_debug_printer in favor of drm_dbg_printer")
>>
>> I have used the drm-misc tree from next-20240209 for today.
>
> Fix at [1].

Commit 826eafebf68b ("drm/tests: mm: Convert to drm_dbg_printer") in
drm-misc-next.

>
> BR,
> Jani.
>
>
> [1] https://lore.kernel.org/r/20240209140818.106685-1-michal.winiarski@intel.com

-- 
Jani Nikula, Intel

Re: linux-next: build failure after merge of the drm-misc tree

[Jani Nikula]

On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> failed like this:
>
> In function 'i915_ttm_placement_from_obj',
>     inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
>   165 |         places[0].flags |= TTM_PL_FLAG_DESIRED;
>       |         ~~~~~~~~~^~~~~~
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
>   837 |         struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
>       |                          ^~~~~~
>
> Caused by commit
>
>   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")

Cc: more people.

>
> I applied the following hack for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 6 Feb 2024 15:17:54 +1100
> Subject: [PATCH] drm/ttm: initialise places
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 80c6cafc8887..34e699e67c25 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
>  
>  static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
>  {
> -	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> +	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
>  	struct ttm_placement placement;
>  
>  	/* restricted by sg_alloc_table */
> -- 
> 2.43.0

-- 
Jani Nikula, Intel

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/xe/xe_guc_submit.c: In function 'simple_error_capture':
drivers/gpu/drm/xe/xe_guc_submit.c:814:48: error: passing argument 1 of 'drm_err_printer' from incompatible pointer type [-Werror=incompatible-pointer-types]
  814 |         struct drm_printer p = drm_err_printer("");
      |                                                ^~
      |                                                |
      |                                                char *
In file included from drivers/gpu/drm/xe/xe_assert.h:11,
                 from drivers/gpu/drm/xe/xe_guc_submit.c:19:
include/drm/drm_print.h:349:69: note: expected 'struct drm_device *' but argument is of type 'char *'
  349 | static inline struct drm_printer drm_err_printer(struct drm_device *drm,
      |                                                  ~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/xe/xe_guc_submit.c:814:32: error: too few arguments to function 'drm_err_printer'
  814 |         struct drm_printer p = drm_err_printer("");
      |                                ^~~~~~~~~~~~~~~
include/drm/drm_print.h:349:34: note: declared here
  349 | static inline struct drm_printer drm_err_printer(struct drm_device *drm,
      |                                  ^~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  5e0c04c8c40b ("drm/print: make drm_err_printer() device specific by using drm_err()")

I have used the drm-misc tree from next-20240209 again today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
>
> On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > failed like this:
> >
> > In function 'i915_ttm_placement_from_obj',
> >     inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> >   165 |         places[0].flags |= TTM_PL_FLAG_DESIRED;
> >       |         ~~~~~~~~~^~~~~~
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> >   837 |         struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> >       |                          ^~~~~~
> >
> > Caused by commit
> >
> >   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")  
> 
> Cc: more people.
> 
> >
> > I applied the following hack for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > Subject: [PATCH] drm/ttm: initialise places
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > index 80c6cafc8887..34e699e67c25 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
> >  
> >  static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> >  {
> > -	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > +	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> >  	struct ttm_placement placement;
> >  
> >  	/* restricted by sg_alloc_table */
> > -- 
> > 2.43.0  

I am still applying the above patch ...

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of 'rzg2l_du_vsp_enable'
   47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
      |      ^~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
                 from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc *)'
   72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc) { };
      |                    ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of 'rzg2l_du_vsp_disable'
   61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
      |      ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc *)'
   73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc) { };
      |                    ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of 'rzg2l_du_vsp_atomic_flush'
   66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct rzg2l_du_crtc *)'
   74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc) { };
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of 'rzg2l_du_vsp_get_drm_plane'
   76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
   75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc *crtc,
      |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of 'rzg2l_du_vsp_init'
  302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
      |     ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *, struct device_node *, unsigned int)'
   66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node *np,
      |                   ^~~~~~~~~~~~~~~~~

Caused by commit

  768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")

I have used the drm-misc tree from next-20240221 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: linux-next: build failure after merge of the drm-misc tree

[Biju Das]

Hi All,

> -----Original Message-----
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Sent: Thursday, February 22, 2024 1:46 AM
> Subject: linux-next: build failure after merge of the drm-misc tree
> 
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> 'rzg2l_du_vsp_enable'
>    47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
>       |      ^~~~~~~~~~~~~~~~~~~
> In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
>                  from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> *)'
>    72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> { };
>       |                    ^~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> 'rzg2l_du_vsp_disable'
>    61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
>       |      ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> *)'
>    73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> *crtc) { };
>       |                    ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> 'rzg2l_du_vsp_atomic_flush'
>    66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
>       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> rzg2l_du_crtc *)'
>    74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> *crtc) { };
>       |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> 'rzg2l_du_vsp_get_drm_plane'
>    76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> *crtc,
>       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> *(struct rzg2l_du_crtc *, unsigned int)'
>    75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> rzg2l_du_crtc *crtc,
>       |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> 'rzg2l_du_vsp_init'
>   302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> *np,
>       |     ^~~~~~~~~~~~~~~~~
> drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> struct device_node *, unsigned int)'
>    66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> struct device_node *np,
>       |                   ^~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> 
> I have used the drm-misc tree from next-20240221 for today.

I will send an incremental patch to fix this build error with x86 on drm-next.

I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.

Cheers,
Biju

Re: linux-next: build failure after merge of the drm-misc tree

[Geert Uytterhoeven]

Hi Biju,

On Thu, Feb 22, 2024 at 9:14 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> > -----Original Message-----
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Sent: Thursday, February 22, 2024 1:46 AM
> > Subject: linux-next: build failure after merge of the drm-misc tree
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> > 'rzg2l_du_vsp_enable'
> >    47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> >       |      ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> >                  from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >    72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > { };
> >       |                    ^~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> > 'rzg2l_du_vsp_disable'
> >    61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> >       |      ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >    73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > *crtc) { };
> >       |                    ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> > 'rzg2l_du_vsp_atomic_flush'
> >    66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> >       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > rzg2l_du_crtc *)'
> >    74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> > *crtc) { };
> >       |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> > 'rzg2l_du_vsp_get_drm_plane'
> >    76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> > *crtc,
> >       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> > *(struct rzg2l_du_crtc *, unsigned int)'
> >    75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > rzg2l_du_crtc *crtc,
> >       |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> > 'rzg2l_du_vsp_init'
> >   302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> > *np,
> >       |     ^~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> > struct device_node *, unsigned int)'
> >    66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> > struct device_node *np,
> >       |                   ^~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> >   768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> >
> > I have used the drm-misc tree from next-20240221 for today.
>
> I will send an incremental patch to fix this build error with x86 on drm-next.
>
> I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
> in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.

Looks like you're also missing an EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable)?

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: linux-next: build failure after merge of the drm-misc tree

[Maxime Ripard]

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

Hi Biju,

On Thu, Feb 22, 2024 at 08:14:14AM +0000, Biju Das wrote:
> > -----Original Message-----
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Sent: Thursday, February 22, 2024 1:46 AM
> > Subject: linux-next: build failure after merge of the drm-misc tree
> > 
> > Hi all,
> > 
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error: redefinition of
> > 'rzg2l_du_vsp_enable'
> >    47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> >       |      ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> >                  from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > definition of 'rzg2l_du_vsp_enable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >    72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > { };
> >       |                    ^~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error: redefinition of
> > 'rzg2l_du_vsp_disable'
> >    61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> >       |      ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > definition of 'rzg2l_du_vsp_disable' with type 'void(struct rzg2l_du_crtc
> > *)'
> >    73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > *crtc) { };
> >       |                    ^~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error: redefinition of
> > 'rzg2l_du_vsp_atomic_flush'
> >    66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> >       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > rzg2l_du_crtc *)'
> >    74 | static inline void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc
> > *crtc) { };
> >       |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error: redefinition of
> > 'rzg2l_du_vsp_get_drm_plane'
> >    76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct rzg2l_du_crtc
> > *crtc,
> >       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct drm_plane
> > *(struct rzg2l_du_crtc *, unsigned int)'
> >    75 | static inline struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > rzg2l_du_crtc *crtc,
> >       |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error: redefinition of
> > 'rzg2l_du_vsp_init'
> >   302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct device_node
> > *np,
> >       |     ^~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp *,
> > struct device_node *, unsigned int)'
> >    66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp,
> > struct device_node *np,
> >       |                   ^~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > 
> > I have used the drm-misc tree from next-20240221 for today.
> 
> I will send an incremental patch to fix this build error with x86 on drm-next.

Any chance you can do it today? We need to send the drm-misc-next PR.

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

RE: linux-next: build failure after merge of the drm-misc tree

[Biju Das]

Hi Maxime Ripard,

> -----Original Message-----
> From: Maxime Ripard <mripard@kernel.org>
> Sent: Thursday, February 22, 2024 8:32 AM
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Subject: Re: linux-next: build failure after merge of the drm-misc tree
> 
> Hi Biju,
> 
> On Thu, Feb 22, 2024 at 08:14:14AM +0000, Biju Das wrote:
> > > -----Original Message-----
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Sent: Thursday, February 22, 2024 1:46 AM
> > > Subject: linux-next: build failure after merge of the drm-misc tree
> > >
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error:
> > > redefinition of 'rzg2l_du_vsp_enable'
> > >    47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > >                  from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > > definition of 'rzg2l_du_vsp_enable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error:
> > > redefinition of 'rzg2l_du_vsp_disable'
> > >    61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > > definition of 'rzg2l_du_vsp_disable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error:
> > > redefinition of 'rzg2l_du_vsp_atomic_flush'
> > >    66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    74 | static inline void rzg2l_du_vsp_atomic_flush(struct
> > > rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error:
> > > redefinition of 'rzg2l_du_vsp_get_drm_plane'
> > >    76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > >       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct
> > > drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
> > >    75 | static inline struct drm_plane
> > > *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > >       |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error:
> > > redefinition of 'rzg2l_du_vsp_init'
> > >   302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
> > > device_node *np,
> > >       |     ^~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp
> > > *, struct device_node *, unsigned int)'
> > >    66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp
> > > *vsp, struct device_node *np,
> > >       |                   ^~~~~~~~~~~~~~~~~
> > >
> > > Caused by commit
> > >
> > >   768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > >
> > > I have used the drm-misc tree from next-20240221 for today.
> >
> > I will send an incremental patch to fix this build error with x86 on
> drm-next.
> 
> Any chance you can do it today? We need to send the drm-misc-next PR.

Yes I am on it.

Cheers,
Biju

RE: linux-next: build failure after merge of the drm-misc tree

[Biju Das]

Hi Geert,

Thanks for the feedback.

> -----Original Message-----
> From: Geert Uytterhoeven <geert@linux-m68k.org>
> Sent: Thursday, February 22, 2024 8:29 AM
> Subject: Re: linux-next: build failure after merge of the drm-misc tree
> 
> Hi Biju,
> 
> On Thu, Feb 22, 2024 at 9:14 AM Biju Das <biju.das.jz@bp.renesas.com>
> wrote:
> > > -----Original Message-----
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Sent: Thursday, February 22, 2024 1:46 AM
> > > Subject: linux-next: build failure after merge of the drm-misc tree
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:47:6: error:
> > > redefinition of 'rzg2l_du_vsp_enable'
> > >    47 | void rzg2l_du_vsp_enable(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h:18,
> > >                  from drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:30:
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:72:20: note: previous
> > > definition of 'rzg2l_du_vsp_enable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    72 | static inline void rzg2l_du_vsp_enable(struct rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:61:6: error:
> > > redefinition of 'rzg2l_du_vsp_disable'
> > >    61 | void rzg2l_du_vsp_disable(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:73:20: note: previous
> > > definition of 'rzg2l_du_vsp_disable' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    73 | static inline void rzg2l_du_vsp_disable(struct rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:66:6: error:
> > > redefinition of 'rzg2l_du_vsp_atomic_flush'
> > >    66 | void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
> > >       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:74:20: note: previous
> > > definition of 'rzg2l_du_vsp_atomic_flush' with type 'void(struct
> > > rzg2l_du_crtc *)'
> > >    74 | static inline void rzg2l_du_vsp_atomic_flush(struct
> > > rzg2l_du_crtc
> > > *crtc) { };
> > >       |                    ^~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:76:19: error:
> > > redefinition of 'rzg2l_du_vsp_get_drm_plane'
> > >    76 | struct drm_plane *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > >       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:75:33: note: previous
> > > definition of 'rzg2l_du_vsp_get_drm_plane' with type 'struct
> > > drm_plane *(struct rzg2l_du_crtc *, unsigned int)'
> > >    75 | static inline struct drm_plane
> > > *rzg2l_du_vsp_get_drm_plane(struct
> > > rzg2l_du_crtc *crtc,
> > >       |                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c:302:5: error:
> > > redefinition of 'rzg2l_du_vsp_init'
> > >   302 | int rzg2l_du_vsp_init(struct rzg2l_du_vsp *vsp, struct
> > > device_node *np,
> > >       |     ^~~~~~~~~~~~~~~~~
> > > drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h:66:19: note: previous
> > > definition of 'rzg2l_du_vsp_init' with type 'int(struct rzg2l_du_vsp
> > > *, struct device_node *, unsigned int)'
> > >    66 | static inline int rzg2l_du_vsp_init(struct rzg2l_du_vsp
> > > *vsp, struct device_node *np,
> > >       |                   ^~~~~~~~~~~~~~~~~
> > >
> > > Caused by commit
> > >
> > >   768e9e61b3b9 ("drm: renesas: Add RZ/G2L DU Support")
> > >
> > > I have used the drm-misc tree from next-20240221 for today.
> >
> > I will send an incremental patch to fix this build error with x86 on
> drm-next.
> >
> > I need to use the macro #if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
> > in drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h to fix this error.
> 
> Looks like you're also missing an EXPORT_SYMBOL_GPL(rzg2l_du_vsp_enable)?

Yes, Will add this aswell, as CONFIG_VIDEO_RENESAS_VSP1=m for x86.

Cheers,
Biju

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
> >
> > On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > > failed like this:
> > >
> > > In function 'i915_ttm_placement_from_obj',
> > >     inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> > >   165 |         places[0].flags |= TTM_PL_FLAG_DESIRED;
> > >       |         ~~~~~~~~~^~~~~~
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> > >   837 |         struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > >       |                          ^~~~~~
> > >
> > > Caused by commit
> > >
> > >   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")    
> > 
> > Cc: more people.
> >   
> > >
> > > I applied the following hack for today:
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > > Subject: [PATCH] drm/ttm: initialise places
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > index 80c6cafc8887..34e699e67c25 100644
> > > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
> > >  
> > >  static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > >  {
> > > -	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > +	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > >  	struct ttm_placement placement;
> > >  
> > >  	/* restricted by sg_alloc_table */
> > > -- 
> > > 2.43.0    
> 
> I am still applying the above patch ...

Any progress?

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

On Mon, 26 Feb 2024 08:41:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:  
> > >
> > > On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:    
> > > >
> > > > After merging the drm-misc tree, today's linux-next build (i386 defconfig)
> > > > failed like this:
> > > >
> > > > In function 'i915_ttm_placement_from_obj',
> > > >     inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
> > > >   165 |         places[0].flags |= TTM_PL_FLAG_DESIRED;
> > > >       |         ~~~~~~~~~^~~~~~
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
> > > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
> > > >   837 |         struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > >       |                          ^~~~~~
> > > >
> > > > Caused by commit
> > > >
> > > >   a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")      
> > > 
> > > Cc: more people.
> > >     
> > > >
> > > > I applied the following hack for today:
> > > >
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Tue, 6 Feb 2024 15:17:54 +1100
> > > > Subject: [PATCH] drm/ttm: initialise places
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > ---
> > > >  drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > index 80c6cafc8887..34e699e67c25 100644
> > > > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> > > > @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
> > > >  
> > > >  static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
> > > >  {
> > > > -	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
> > > > +	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
> > > >  	struct ttm_placement placement;
> > > >  
> > > >  	/* restricted by sg_alloc_table */
> > > > -- 
> > > > 2.43.0      
> > 
> > I am still applying the above patch ...  
> 
> Any progress?

And this commit is now in the drm tree.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Christian König]

Am 25.02.24 um 22:47 schrieb Stephen Rothwell:
> Hi all,
>
> On Mon, 26 Feb 2024 08:41:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> On Tue, 20 Feb 2024 08:48:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> On Mon, 12 Feb 2024 15:15:54 +0200 Jani Nikula <jani.nikula@linux.intel.com> wrote:
>>>> On Tue, 06 Feb 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>>> After merging the drm-misc tree, today's linux-next build (i386 defconfig)
>>>>> failed like this:
>>>>>
>>>>> In function 'i915_ttm_placement_from_obj',
>>>>>      inlined from 'i915_ttm_get_pages' at drivers/gpu/drm/i915/gem/i915_gem_ttm.c:847:2:
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:165:18: error: 'places[0].flags' is used uninitialized [-Werror=uninitialized]
>>>>>    165 |         places[0].flags |= TTM_PL_FLAG_DESIRED;
>>>>>        |         ~~~~~~~~~^~~~~~
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c: In function 'i915_ttm_get_pages':
>>>>> drivers/gpu/drm/i915/gem/i915_gem_ttm.c:837:26: note: 'places' declared here
>>>>>    837 |         struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
>>>>>        |                          ^~~~~~
>>>>>
>>>>> Caused by commit
>>>>>
>>>>>    a78a8da51b36 ("drm/ttm: replace busy placement with flags v6")
>>>> Cc: more people.
>>>>      
>>>>> I applied the following hack for today:
>>>>>
>>>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>>>> Date: Tue, 6 Feb 2024 15:17:54 +1100
>>>>> Subject: [PATCH] drm/ttm: initialise places
>>>>>
>>>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>>>> ---
>>>>>   drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +-
>>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> index 80c6cafc8887..34e699e67c25 100644
>>>>> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
>>>>> @@ -834,7 +834,7 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj,
>>>>>   
>>>>>   static int i915_ttm_get_pages(struct drm_i915_gem_object *obj)
>>>>>   {
>>>>> -	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1];
>>>>> +	struct ttm_place places[I915_TTM_MAX_PLACEMENTS + 1] = {};
>>>>>   	struct ttm_placement placement;
>>>>>   
>>>>>   	/* restricted by sg_alloc_table */
>>>>> -- 
>>>>> 2.43.0
>>> I am still applying the above patch ...
>> Any progress?
> And this commit is now in the drm tree.

Sorry for the delay. Oring in the flag needs to come after the call and 
not before it.

Going to fix this.

Thanks,
Christian.

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build
(x86_64_allmodconfig) failed like this:

In file included from drivers/gpu/drm/panthor/panthor_fw.c:19:
drivers/gpu/drm/panthor/panthor_fw.c: In function 'panthor_job_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable 'cookie' [-Werror=unused-variable]
  326 |         int cookie;                                                                             \
      |             ^~~~~~
drivers/gpu/drm/panthor/panthor_fw.c:979:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
  979 | PANTHOR_IRQ_HANDLER(job, JOB, panthor_job_irq_handler);
      | ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/panthor/panthor_fw.c: In function 'panthor_job_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable 'cookie' [-Werror=unused-variable]
  336 |         int cookie;                                                                             \
      |             ^~~~~~
drivers/gpu/drm/panthor/panthor_fw.c:979:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
  979 | PANTHOR_IRQ_HANDLER(job, JOB, panthor_job_irq_handler);
      | ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
In file included from drivers/gpu/drm/panthor/panthor_gpu.c:19:
drivers/gpu/drm/panthor/panthor_gpu.c: In function 'panthor_gpu_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable 'cookie' [-Werror=unused-variable]
  326 |         int cookie;                                                                             \
      |             ^~~~~~
drivers/gpu/drm/panthor/panthor_gpu.c:166:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
  166 | PANTHOR_IRQ_HANDLER(gpu, GPU, panthor_gpu_irq_handler);
      | ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/panthor/panthor_gpu.c: In function 'panthor_gpu_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable 'cookie' [-Werror=unused-variable]
  336 |         int cookie;                                                                             \
      |             ^~~~~~
drivers/gpu/drm/panthor/panthor_gpu.c:166:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
  166 | PANTHOR_IRQ_HANDLER(gpu, GPU, panthor_gpu_irq_handler);
      | ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
In file included from drivers/gpu/drm/panthor/panthor_mmu.c:30:
drivers/gpu/drm/panthor/panthor_mmu.c: In function 'panthor_mmu_irq_suspend':
drivers/gpu/drm/panthor/panthor_device.h:326:13: error: unused variable 'cookie' [-Werror=unused-variable]
  326 |         int cookie;                                                                             \
      |             ^~~~~~
drivers/gpu/drm/panthor/panthor_mmu.c:1689:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
 1689 | PANTHOR_IRQ_HANDLER(mmu, MMU, panthor_mmu_irq_handler);
      | ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/panthor/panthor_mmu.c: In function 'panthor_mmu_irq_resume':
drivers/gpu/drm/panthor/panthor_device.h:336:13: error: unused variable 'cookie' [-Werror=unused-variable]
  336 |         int cookie;                                                                             \
      |             ^~~~~~
drivers/gpu/drm/panthor/panthor_mmu.c:1689:1: note: in expansion of macro 'PANTHOR_IRQ_HANDLER'
 1689 | PANTHOR_IRQ_HANDLER(mmu, MMU, panthor_mmu_irq_handler);
      | ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  962f88b9c916 ("drm/panthor: Drop the dev_enter/exit() sections in _irq_suspend/resume()")

I have used the drm-misc tree from next-20240402 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_bo.c:26:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_fence.c:4:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_gem.c:15:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_mmu.c:21:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_irq.c:19:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_sched.c:26:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_trace_points.c:4:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_sysfs.c:9:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_debugfs.c:12:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/v3d/v3d_drv.h:14,
                 from drivers/gpu/drm/v3d/v3d_submit.c:9:
drivers/gpu/drm/v3d/v3d_performance_counters.h:118:43: warning: 'v3d_v42_performance_counters' defined but not used [-Wunused-const-variable=]
  118 | static const struct v3d_perf_counter_desc v3d_v42_performance_counters[] = {
      |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  3cbcbe016c31 ("drm/v3d: Add Performance Counters descriptions for V3D 4.2 and 7.1")

I have used the drm-misc tree from next-20240528 for today.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c: In function 'sun4i_hdmi_connector_mode_valid':
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c:213:17: error: implicit declaration of function 'drm_connector_hdmi_compute_mode_clock'; did you mean 'drm_hdmi_compute_mode_clock'? [-Werror=implicit-function-declaration]
  213 |                 drm_connector_hdmi_compute_mode_clock(mode, 8,
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                 drm_hdmi_compute_mode_clock
cc1: some warnings being treated as errors

Caused by commit

  ea64761a54a2 ("drm/sun4i: hdmi: Switch to HDMI connector")

I have used the drm-misc tree from next-20240528 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Maxime Ripard]

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

Hi,

On Wed, May 29, 2024 at 12:35:31PM GMT, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c: In function 'sun4i_hdmi_connector_mode_valid':
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c:213:17: error: implicit declaration of function 'drm_connector_hdmi_compute_mode_clock'; did you mean 'drm_hdmi_compute_mode_clock'? [-Werror=implicit-function-declaration]
>   213 |                 drm_connector_hdmi_compute_mode_clock(mode, 8,
>       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |                 drm_hdmi_compute_mode_clock
> cc1: some warnings being treated as errors
> 
> Caused by commit
> 
>   ea64761a54a2 ("drm/sun4i: hdmi: Switch to HDMI connector")
> 
> I have used the drm-misc tree from next-20240528 for today.

Thanks for the report. A fix is now merged into drm-misc-next
https://lore.kernel.org/dri-devel/20240528151056.2104153-1-mripard@kernel.org/

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 273 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
   31 |         gpiod_set_value_cansleep(tdp158->enable, 1);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'? [-Wimplicit-function-declaration]
   80 |         tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
      |                          ^~~~~~~~~~~~~~~~~~~~~~~
      |                          devm_regulator_get_optional
drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW' undeclared (first use in this function)
   80 |         tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
      |                                                                 ^~~~~~~~~~~~~
drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  a15710027afb ("drm/bridge: add support for TI TDP158")

I have used the drm-misc tree from next-20240903 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Jani Nikula]

On Wed, 04 Sep 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
> drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
>    31 |         gpiod_set_value_cansleep(tdp158->enable, 1);
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
> drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_regulator_get_optional'? [-Wimplicit-function-declaration]
>    80 |         tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
>       |                          ^~~~~~~~~~~~~~~~~~~~~~~
>       |                          devm_regulator_get_optional
> drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW' undeclared (first use in this function)
>    80 |         tdp158->enable = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_LOW);
>       |                                                                 ^~~~~~~~~~~~~
> drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
>   a15710027afb ("drm/bridge: add support for TI TDP158")
>
> I have used the drm-misc tree from next-20240903 for today.

Fixed by commit 532f0d109658 ("drm/bridge/tdp158: fix build failure") in
drm-misc-next.

BR,
Jani.

-- 
Jani Nikula, Intel

Re: linux-next: build failure after merge of the drm-misc tree

[Robert Foss]

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

On Wed, Sep 4, 2024, 11:58 Jani Nikula <jani.nikula@linux.intel.com> wrote:

> On Wed, 04 Sep 2024, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_enable':
> > drivers/gpu/drm/bridge/ti-tdp158.c:31:9: error: implicit declaration of
> function 'gpiod_set_value_cansleep' [-Wimplicit-function-declaration]
> >    31 |         gpiod_set_value_cansleep(tdp158->enable, 1);
> >       |         ^~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/gpu/drm/bridge/ti-tdp158.c: In function 'tdp158_probe':
> > drivers/gpu/drm/bridge/ti-tdp158.c:80:26: error: implicit declaration of
> function 'devm_gpiod_get_optional'; did you mean
> 'devm_regulator_get_optional'? [-Wimplicit-function-declaration]
> >    80 |         tdp158->enable = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_LOW);
> >       |                          ^~~~~~~~~~~~~~~~~~~~~~~
> >       |                          devm_regulator_get_optional
> > drivers/gpu/drm/bridge/ti-tdp158.c:80:65: error: 'GPIOD_OUT_LOW'
> undeclared (first use in this function)
> >    80 |         tdp158->enable = devm_gpiod_get_optional(dev, "enable",
> GPIOD_OUT_LOW);
> >       |
>  ^~~~~~~~~~~~~
> > drivers/gpu/drm/bridge/ti-tdp158.c:80:65: note: each undeclared
> identifier is reported only once for each function it appears in
> >
> > Caused by commit
> >
> >   a15710027afb ("drm/bridge: add support for TI TDP158")
> >
> > I have used the drm-misc tree from next-20240903 for today.
>
> Fixed by commit 532f0d109658 ("drm/bridge/tdp158: fix build failure") in
> drm-misc-next.
>

Thank you Jani

[-- Attachment #2: Type: text/html, Size: 2539 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/module.h:22,
                 from include/linux/device/driver.h:21,
                 from include/linux/device.h:32,
                 from include/linux/dma-mapping.h:5,
                 from include/linux/dma-buf.h:21,
                 from include/linux/virtio_dma_buf.h:11,
                 from drivers/gpu/drm/virtio/virtgpu_prime.c:26:
drivers/gpu/drm/virtio/virtgpu_prime.c:30:18: error: expected ',' or ';' before 'DMA_BUF'
   30 | MODULE_IMPORT_NS(DMA_BUF);
      |                  ^~~~~~~
include/linux/moduleparam.h:26:61: note: in definition of macro '__MODULE_INFO'
   26 |                 = __MODULE_INFO_PREFIX __stringify(tag) "=" info
      |                                                             ^~~~
include/linux/module.h:299:33: note: in expansion of macro 'MODULE_INFO'
  299 | #define MODULE_IMPORT_NS(ns)    MODULE_INFO(import_ns, ns)
      |                                 ^~~~~~~~~~~
drivers/gpu/drm/virtio/virtgpu_prime.c:30:1: note: in expansion of macro 'MODULE_IMPORT_NS'
   30 | MODULE_IMPORT_NS(DMA_BUF);
      | ^~~~~~~~~~~~~~~~

Caused by commit

  25c3fd1183c0 ("drm/virtio: Add a helper to map and note the dma addrs and lengths")

Interacting with commit

  cdd30ebb1b9f ("module: Convert symbol namespace to string literal")

from Linus' tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Dec 2024 12:08:24 +1100
Subject: [PATCH] fix up for "drm/virtio: Add a helper to map and note the dma
 addrs and lengths"

interacting with commit

  cdd30ebb1b9f ("module: Convert symbol namespace to string literal")

from Linus' tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/virtio/virtgpu_prime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c
index 688810d1b611..b3664c12843d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_prime.c
+++ b/drivers/gpu/drm/virtio/virtgpu_prime.c
@@ -27,7 +27,7 @@
 
 #include "virtgpu_drv.h"
 
-MODULE_IMPORT_NS(DMA_BUF);
+MODULE_IMPORT_NS("DMA_BUF");
 
 static int virtgpu_virtio_get_uuid(struct dma_buf *buf,
 				   uuid_t *uuid)
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

scripts/Makefile.build:41: drivers/gpu/drm/i2c/Makefile: No such file or directory
make[7]: *** No rule to make target 'drivers/gpu/drm/i2c/Makefile'.  Stop.

Presuably caused by commit

  325ba852d148 ("drm/i2c: move TDA998x driver under drivers/gpu/drm/bridge")

I have used the drm-misc tree from next-20250212 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c: In function 'analogix_dp_probe':
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c:1589:17: error: label 'err_disable_clk' used but not defined
 1589 |                 goto err_disable_clk;
      |                 ^~~~

Caused by commit

  6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")

I have used the drm-misc tree from next-20250527 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Damon Ding]

Hi Stephen,

On 2025/5/28 11:42, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c: In function 'analogix_dp_probe':
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c:1589:17: error: label 'err_disable_clk' used but not defined
>   1589 |                 goto err_disable_clk;
>        |                 ^~~~
> 
> Caused by commit
> 
>    6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")
> 
> I have used the drm-misc tree from next-20250527 for today.
> 

Oh, I have found the same compile error after rebasing.

I have removed the 'err_disable_clk' flag and made it return 
ERR_PTR(ret) in:
https://lore.kernel.org/all/20250310104114.2608063-7-damon.ding@rock-chips.com/

Likely a small merge conflict bug. Will patch it later. ;-)

Best regards,
Damon

Re: linux-next: build failure after merge of the drm-misc tree

[Heiko Stübner]

Hi,

Am Mittwoch, 28. Mai 2025, 09:17:13 Mitteleuropäische Sommerzeit schrieb Damon Ding:
> On 2025/5/28 11:42, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c: In function 'analogix_dp_probe':
> > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c:1589:17: error: label 'err_disable_clk' used but not defined
> >   1589 |                 goto err_disable_clk;
> >        |                 ^~~~
> > 
> > Caused by commit
> > 
> >    6579a03e68ff ("drm/bridge: analogix_dp: Remove the unnecessary calls to clk_disable_unprepare() during probing")
> > 
> > I have used the drm-misc tree from next-20250527 for today.
> > 
> 
> Oh, I have found the same compile error after rebasing.
> 
> I have removed the 'err_disable_clk' flag and made it return 
> ERR_PTR(ret) in:
> https://lore.kernel.org/all/20250310104114.2608063-7-damon.ding@rock-chips.com/
> 
> Likely a small merge conflict bug. Will patch it later. ;-)

I have sent in a patch for that issue yesterday, in

https://lore.kernel.org/dri-devel/20250527225120.3361663-1-heiko@sntech.de/


Heiko

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c: In function 'ge_b850v3_lvds_detect':
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c:145:16: error: too few arguments to function 'ge_b850v3_lvds_bridge_detect'
  145 |         return ge_b850v3_lvds_bridge_detect(&ge_b850v3_lvds_ptr->bridge);
      |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c:124:1: note: declared here
  124 | ge_b850v3_lvds_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c:146:1: error: control reaches end of non-void function [-Werror=return-type]
  146 | }
      | ^

Caused by commit

  5d156a9c3d5e ("drm/bridge: Pass down connector to drm bridge detect hook")

I have used the drm-misc tree from next-20250714 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the drm-misc tree

[Stephen Rothwell]

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

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/tests/drm_exec_test.c: In function 'test_prepare_array':
drivers/gpu/drm/tests/drm_exec_test.c:171:1: error: the frame size of 2136 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
  171 | }
      | ^
cc1: all warnings being treated as errors

Possibly caused by commit

  e7fa80e2932c ("drm_gem: add mutex to drm_gem_object.gpuva")

I have used the drm-misc tree from next-20250828 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the drm-misc tree

[Danilo Krummrich]

On Fri Aug 29, 2025 at 4:23 AM CEST, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tests/drm_exec_test.c: In function 'test_prepare_array':
> drivers/gpu/drm/tests/drm_exec_test.c:171:1: error: the frame size of 2136 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>   171 | }
>       | ^
> cc1: all warnings being treated as errors
>
> Possibly caused by commit
>
>   e7fa80e2932c ("drm_gem: add mutex to drm_gem_object.gpuva")

Thanks for reporting!

Unfortunately, it didn't happen with my configuration, but I could reproduce it
with a simple allmodconfig. I've send a fix for this [1].

[1] https://lore.kernel.org/dri-devel/20250829075633.2306-1-dakr@kernel.org/