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

[Maarten Lankhorst]

Op 2021-02-10 om 04:11 schreef 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_sched.c:263:1: error: return type is an incomplete 
> type
>   263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job 
> *sched_job)
>   | ^
> drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_gpu_reset_for_timeout':
> drivers/gpu/drm/v3d/v3d_sched.c:289:9: error: 'return' with a value, in 
> function returning void [-Werror=return-type]
>   289 |  return DRM_GPU_SCHED_STAT_NOMINAL;
>   | ^~
> drivers/gpu/drm/v3d/v3d_sched.c:263:1: note: declared here
>   263 | v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job 
> *sched_job)
>   | ^
> drivers/gpu/drm/v3d/v3d_sched.c: At top level:
> drivers/gpu/drm/v3d/v3d_sched.c:298:1: error: return type is an incomplete 
> type
>   298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
>   | ^~~
> drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_cl_job_timedout':
> drivers/gpu/drm/v3d/v3d_sched.c:309:10: error: 'return' with a value, in 
> function returning void [-Werror=return-type]
>   309 |   return DRM_GPU_SCHED_STAT_NOMINAL;
>   |  ^~
> drivers/gpu/drm/v3d/v3d_sched.c:298:1: note: declared here
>   298 | v3d_cl_job_timedout(struct drm_sched_job *sched_job, enum v3d_queue q,
>   | ^~~
> drivers/gpu/drm/v3d/v3d_sched.c: At top level:
> drivers/gpu/drm/v3d/v3d_sched.c:316:1: error: return type is an incomplete 
> type
>   316 | v3d_bin_job_timedout(struct drm_sched_job *sched_job)
>   | ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c:325:1: error: return type is an incomplete 
> type
>   325 | v3d_render_job_timedout(struct drm_sched_job *sched_job)
>   | ^~~
> drivers/gpu/drm/v3d/v3d_sched.c:334:1: error: return type is an incomplete 
> type
>   334 | v3d_generic_job_timedout(struct drm_sched_job *sched_job)
>   | ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c:342:1: error: return type is an incomplete 
> type
>   342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
>   | ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c: In function 'v3d_csd_job_timedout':
> drivers/gpu/drm/v3d/v3d_sched.c:353:10: error: 'return' with a value, in 
> function returning void [-Werror=return-type]
>   353 |   return DRM_GPU_SCHED_STAT_NOMINAL;
>   |  ^~
> drivers/gpu/drm/v3d/v3d_sched.c:342:1: note: declared here
>   342 | v3d_csd_job_timedout(struct drm_sched_job *sched_job)
>   | ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c: At top level:
> drivers/gpu/drm/v3d/v3d_sched.c:362:18: error: initialization of 'enum 
> drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer 
> type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
>   362 |  .timedout_job = v3d_bin_job_timedout,
>   |  ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c:362:18: note: (near initialization for 
> 'v3d_bin_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:369:18: error: initialization of 'enum 
> drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer 
> type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
>   369 |  .timedout_job = v3d_render_job_timedout,
>   |  ^~~
> drivers/gpu/drm/v3d/v3d_sched.c:369:18: note: (near initialization for 
> 'v3d_render_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:376:18: error: initialization of 'enum 
> drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer 
> type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
>   376 |  .timedout_job = v3d_generic_job_timedout,
>   |  ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c:376:18: note: (near initialization for 
> 'v3d_tfu_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:383:18: error: initialization of 'enum 
> drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer 
> type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
>   383 |  .timedout_job = v3d_csd_job_timedout,
>   |  ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c:383:18: note: (near initialization for 
> 'v3d_csd_sched_ops.timedout_job')
> drivers/gpu/drm/v3d/v3d_sched.c:390:18: error: initialization of 'enum 
> drm_gpu_sched_stat (*)(struct drm_sched_job *)' from incompatible pointer 
> type 'void (*)(struct drm_sched_job *)' [-Werror=incompatible-pointer-types]
>   390 |  .timedout_job = v3d_generic_job_timedout,
>   |  ^~~~
> drivers/gpu/drm/v3d/v3d_sched.c:390:18: note: (near 

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

[Thomas Zimmermann]

Hi

Am 14.01.21 um 01:31 schrieb 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/drm_cache.c: In function 'drm_need_swiotlb':
drivers/gpu/drm/drm_cache.c:202:6: error: implicit declaration of function 
'mem_encrypt_active' [-Werror=implicit-function-declaration]
   202 |  if (mem_encrypt_active())
   |  ^~


Caused by commit

   3abc66706385 ("drm: Implement drm_need_swiotlb() in drm_cache.c")

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


Sorry for the breakage. Fixed in drm-misc-next.

Best regards
Thomas





--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer



OpenPGP_signature
Description: OpenPGP digital signature

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

[Michael S. Tsirkin]

On Wed, Nov 11, 2020 at 05:10:15PM +1100, Stephen Rothwell wrote:
> Hi Michael,
> 
> On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin"  
> wrote:
> >
> > On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> > > 
> > > 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_ttm.c:26:
> > > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in 
> > > this function)
> > >99 |  return SIZE_MAX;
> > >   | ^~~~
> > > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header 
> > > ''; did you forget to '#include '?
> > > 6 | #include 
> > >   +++ |+#include 
> > > 7 | #include 
> > > include/linux/swiotlb.h:99:9: note: each undeclared identifier is 
> > > reported only once for each function it appears in
> > >99 |  return SIZE_MAX;
> > >   | ^~~~
> > > 
> > > Caused by commit
> > > 
> > >   abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > > 
> > > but only exposed by commit
> > > 
> > >   4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > > 
> > > I applied the following fix for today:
> > > 
> > > From: Stephen Rothwell 
> > > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> > > 
> > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > > Signed-off-by: Stephen Rothwell   
> > 
> > Acked-by: Michael S. Tsirkin 
> > 
> > I guess it makes sense to pick this up for this release directly.
> > I'll merge this unless there are any objections.
> 
> Christoph is right that the include should not be conditional.  But I
> have not tested that that does not introduce some other problems.

If there's a problem it will be a build failure - I'll put
it in next for a while, this way we'll find out.

> -- 
> Cheers,
> Stephen Rothwell

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

[Stephen Rothwell]

Hi Michael,

On Mon, 2 Nov 2020 05:19:06 -0500 "Michael S. Tsirkin"  wrote:
>
> On Mon, Nov 02, 2020 at 12:43:27PM +1100, Stephen Rothwell wrote:
> > 
> > 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_ttm.c:26:
> > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in 
> > this function)
> >99 |  return SIZE_MAX;
> >   | ^~~~
> > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header 
> > ''; did you forget to '#include '?
> > 6 | #include 
> >   +++ |+#include 
> > 7 | #include 
> > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported 
> > only once for each function it appears in
> >99 |  return SIZE_MAX;
> >   | ^~~~
> > 
> > Caused by commit
> > 
> >   abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > 
> > but only exposed by commit
> > 
> >   4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > 
> > I applied the following fix for today:
> > 
> > From: Stephen Rothwell 
> > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> > 
> > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > Signed-off-by: Stephen Rothwell   
> 
> Acked-by: Michael S. Tsirkin 
> 
> I guess it makes sense to pick this up for this release directly.
> I'll merge this unless there are any objections.

Christoph is right that the include should not be conditional.  But I
have not tested that that does not introduce some other problems.

-- 
Cheers,
Stephen Rothwell


pgpwer4pKyaal.pgp
Description: OpenPGP digital signature

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

[Michael S. Tsirkin]

On Mon, Nov 02, 2020 at 10:27:11AM +, Christoph Hellwig wrote:
> On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> > > --- a/include/linux/swiotlb.h
> > > +++ b/include/linux/swiotlb.h
> > > @@ -5,6 +5,9 @@
> > >  #include 
> > >  #include 
> > >  #include 
> > > +#ifndef CONFIG_SWIOTLB
> > > +#include 
> > > +#endif
> 
> No conditional includes please.  And the proper fix for the reported
> issue is to stop poking into swiotlb internals in random drivers..

Meaning?

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

[Daniel Vetter]

On Mon, Nov 2, 2020 at 11:23 AM Michael S. Tsirkin  wrote:
>
> On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> > On Mon, Nov 2, 2020 at 2:43 AM 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_ttm.c:26:
> > > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in 
> > > this function)
> > >99 |  return SIZE_MAX;
> > >   | ^~~~
> > > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header 
> > > ''; did you forget to '#include '?
> > > 6 | #include 
> > >   +++ |+#include 
> > > 7 | #include 
> > > include/linux/swiotlb.h:99:9: note: each undeclared identifier is 
> > > reported only once for each function it appears in
> > >99 |  return SIZE_MAX;
> > >   | ^~~~
> > >
> > > Caused by commit
> > >
> > >   abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > >
> > > but only exposed by commit
> > >
> > >   4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> > >
> > > I applied the following fix for today:
> > >
> > > From: Stephen Rothwell 
> > > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> > >
> > > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > > Signed-off-by: Stephen Rothwell 
> >
> > I think simplest if this lands through dma-api tree into current -rc
> > kernels. Or should we just put this into drm-misc-next since that's
> > where the problem shows up? Christoph, any preference from dma-api
> > side?
> > -Daniel
>
>
> Or I can merge it since I merged the original patch causing the
> issue ...

Works for me too.
-Daniel
>
> > > ---
> > >  include/linux/swiotlb.h | 3 +++
> > >  1 file changed, 3 insertions(+)
> > >
> > > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> > > index 513913ff7486..ed9de7855d3b 100644
> > > --- a/include/linux/swiotlb.h
> > > +++ b/include/linux/swiotlb.h
> > > @@ -5,6 +5,9 @@
> > >  #include 
> > >  #include 
> > >  #include 
> > > +#ifndef CONFIG_SWIOTLB
> > > +#include 
> > > +#endif
> > >
> > >  struct device;
> > >  struct page;
> > > --
> > > 2.28.0
> > >
> > > --
> > > Cheers,
> > > Stephen Rothwell
> >
> >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
>


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

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

[Christoph Hellwig]

On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> > --- a/include/linux/swiotlb.h
> > +++ b/include/linux/swiotlb.h
> > @@ -5,6 +5,9 @@
> >  #include 
> >  #include 
> >  #include 
> > +#ifndef CONFIG_SWIOTLB
> > +#include 
> > +#endif

No conditional includes please.  And the proper fix for the reported
issue is to stop poking into swiotlb internals in random drivers..

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

[Michael S. Tsirkin]

On Mon, Nov 02, 2020 at 10:28:34AM +0100, Daniel Vetter wrote:
> On Mon, Nov 2, 2020 at 2:43 AM 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_ttm.c:26:
> > include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> > include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in 
> > this function)
> >99 |  return SIZE_MAX;
> >   | ^~~~
> > include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header 
> > ''; did you forget to '#include '?
> > 6 | #include 
> >   +++ |+#include 
> > 7 | #include 
> > include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported 
> > only once for each function it appears in
> >99 |  return SIZE_MAX;
> >   | ^~~~
> >
> > Caused by commit
> >
> >   abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> >
> > but only exposed by commit
> >
> >   4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> >
> > I applied the following fix for today:
> >
> > From: Stephen Rothwell 
> > Date: Mon, 2 Nov 2020 12:34:57 +1100
> > Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> >
> > Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> > Signed-off-by: Stephen Rothwell 
> 
> I think simplest if this lands through dma-api tree into current -rc
> kernels. Or should we just put this into drm-misc-next since that's
> where the problem shows up? Christoph, any preference from dma-api
> side?
> -Daniel


Or I can merge it since I merged the original patch causing the
issue ...

> > ---
> >  include/linux/swiotlb.h | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> > index 513913ff7486..ed9de7855d3b 100644
> > --- a/include/linux/swiotlb.h
> > +++ b/include/linux/swiotlb.h
> > @@ -5,6 +5,9 @@
> >  #include 
> >  #include 
> >  #include 
> > +#ifndef CONFIG_SWIOTLB
> > +#include 
> > +#endif
> >
> >  struct device;
> >  struct page;
> > --
> > 2.28.0
> >
> > --
> > 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

[Michael S. Tsirkin]

On Mon, Nov 02, 2020 at 12:43:27PM +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_ttm.c:26:
> include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this 
> function)
>99 |  return SIZE_MAX;
>   | ^~~~
> include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header 
> ''; did you forget to '#include '?
> 6 | #include 
>   +++ |+#include 
> 7 | #include 
> include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported 
> only once for each function it appears in
>99 |  return SIZE_MAX;
>   | ^~~~
> 
> Caused by commit
> 
>   abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> 
> but only exposed by commit
> 
>   4dbafbd30aef ("drm/nouveu: fix swiotlb include")
> 
> I applied the following fix for today:
> 
> From: Stephen Rothwell 
> Date: Mon, 2 Nov 2020 12:34:57 +1100
> Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
> 
> Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> Signed-off-by: Stephen Rothwell 

Acked-by: Michael S. Tsirkin 

I guess it makes sense to pick this up for this release directly.
I'll merge this unless there are any objections.

> ---
>  include/linux/swiotlb.h | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 513913ff7486..ed9de7855d3b 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -5,6 +5,9 @@
>  #include 
>  #include 
>  #include 
> +#ifndef CONFIG_SWIOTLB
> +#include 
> +#endif
>  
>  struct device;
>  struct page;
> -- 
> 2.28.0
> 
> -- 
> Cheers,
> Stephen Rothwell

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

[Daniel Vetter]

On Mon, Nov 2, 2020 at 2:43 AM 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_ttm.c:26:
> include/linux/swiotlb.h: In function 'swiotlb_max_mapping_size':
> include/linux/swiotlb.h:99:9: error: 'SIZE_MAX' undeclared (first use in this 
> function)
>99 |  return SIZE_MAX;
>   | ^~~~
> include/linux/swiotlb.h:7:1: note: 'SIZE_MAX' is defined in header 
> ''; did you forget to '#include '?
> 6 | #include 
>   +++ |+#include 
> 7 | #include 
> include/linux/swiotlb.h:99:9: note: each undeclared identifier is reported 
> only once for each function it appears in
>99 |  return SIZE_MAX;
>   | ^~~~
>
> Caused by commit
>
>   abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
>
> but only exposed by commit
>
>   4dbafbd30aef ("drm/nouveu: fix swiotlb include")
>
> I applied the following fix for today:
>
> From: Stephen Rothwell 
> Date: Mon, 2 Nov 2020 12:34:57 +1100
> Subject: [PATCH] swiotlb: using SIZE_MAX needs limits.h included
>
> Fixes: abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
> Signed-off-by: Stephen Rothwell 

I think simplest if this lands through dma-api tree into current -rc
kernels. Or should we just put this into drm-misc-next since that's
where the problem shows up? Christoph, any preference from dma-api
side?
-Daniel

> ---
>  include/linux/swiotlb.h | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
> index 513913ff7486..ed9de7855d3b 100644
> --- a/include/linux/swiotlb.h
> +++ b/include/linux/swiotlb.h
> @@ -5,6 +5,9 @@
>  #include 
>  #include 
>  #include 
> +#ifndef CONFIG_SWIOTLB
> +#include 
> +#endif
>
>  struct device;
>  struct page;
> --
> 2.28.0
>
> --
> 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

[Christian König]

Am 30.10.20 um 01:07 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/nouveau/nouveau_ttm.c: In function 'nouveau_ttm_init':
drivers/gpu/drm/nouveau/nouveau_ttm.c:320:19: error: implicit declaration of 
function 'swiotlb_nr_tbl' [-Werror=implicit-function-declaration]
   320 |  need_swiotlb = !!swiotlb_nr_tbl();
   |   ^~


Mhm, thanks for the note. Looks like there is some merge conflict to me.

In my tree there is an "#if IS_ENABLED(CONFIG_SWIOTLB) && 
IS_ENABLED(CONFIG_X86)" around that line making sure the function is 
available.


Going to take a look later today.

Christian.


Caused by commit

   ee5d2a8e549e ("drm/ttm: wire up the new pool as default one v2")

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

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

[Paul Cercueil]

Hi Stephen,

Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell  
a écrit :

Hi all,

On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell 
 wrote:


 On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell 
 wrote:

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

 In file included from include/linux/clk.h:13,
  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 
'ingenic_drm_update_palette':
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/kernel.h:47:33: note: in definition of macro 
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))

   | ^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/kernel.h:47:48: note: in definition of macro 
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))

   |^~~
 In file included from include/linux/bits.h:22,
  from include/linux/bitops.h:5,
  from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/build_bug.h:16:62: note: in definition of macro 
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { 
int:(-!!(e)); })))
   | 
 ^
 include/linux/compiler.h:224:46: note: in expansion of macro 
'__same_type'
   224 | #define __must_be_array(a) 
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))

   |  ^~~
 include/linux/kernel.h:47:59: note: in expansion of macro 
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
   |   
^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in 
expansion of macro 'ARRAY_SIZE'
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |  ^~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/build_bug.h:16:62: note: in definition of macro 
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { 
int:(-!!(e)); })))
   | 
 ^
 include/linux/compiler.h:224:46: note: in expansion of macro 
'__same_type'
   224 | #define __must_be_array(a) 
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))

   |  ^~~
 include/linux/kernel.h:47:59: note: in expansion of macro 
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
   |   
^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in 
expansion of macro 'ARRAY_SIZE'
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |  ^~
 include/linux/build_bug.h:16:51: error: bit-field '' 
width not an integer constant
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { 
int:(-!!(e)); })))

   |   ^
 include/linux/compiler.h:224:28: note: in expansion of macro 
'BUILD_BUG_ON_ZERO'
   224 | #define __must_be_array(a) 
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))

   |^
 include/linux/kernel.h:47:59: note: in expansion of macro 
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
   |   
^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in 
expansion of macro 'ARRAY_SIZE'
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

  

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

[Paul Cercueil]

Hi Stephen,

Le lun. 12 oct. 2020 à 15:24, Stephen Rothwell  
a écrit :

Hi all,

On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell 
 wrote:


 On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell 
 wrote:

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

 In file included from include/linux/clk.h:13,
  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 
'ingenic_drm_update_palette':
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/kernel.h:47:33: note: in definition of macro 
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))

   | ^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/kernel.h:47:48: note: in definition of macro 
'ARRAY_SIZE'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))

   |^~~
 In file included from include/linux/bits.h:22,
  from include/linux/bitops.h:5,
  from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/build_bug.h:16:62: note: in definition of macro 
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { 
int:(-!!(e)); })))
   | 
 ^
 include/linux/compiler.h:224:46: note: in expansion of macro 
'__same_type'
   224 | #define __must_be_array(a) 
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))

   |  ^~~
 include/linux/kernel.h:47:59: note: in expansion of macro 
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
   |   
^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in 
expansion of macro 'ARRAY_SIZE'
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |  ^~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
'dma_hwdesc_f0'?
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |   ^~~
 include/linux/build_bug.h:16:62: note: in definition of macro 
'BUILD_BUG_ON_ZERO'
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { 
int:(-!!(e)); })))
   | 
 ^
 include/linux/compiler.h:224:46: note: in expansion of macro 
'__same_type'
   224 | #define __must_be_array(a) 
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))

   |  ^~~
 include/linux/kernel.h:47:59: note: in expansion of macro 
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
   |   
^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in 
expansion of macro 'ARRAY_SIZE'
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

   |  ^~
 include/linux/build_bug.h:16:51: error: bit-field '' 
width not an integer constant
16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { 
int:(-!!(e)); })))

   |   ^
 include/linux/compiler.h:224:28: note: in expansion of macro 
'BUILD_BUG_ON_ZERO'
   224 | #define __must_be_array(a) 
BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))

   |^
 include/linux/kernel.h:47:59: note: in expansion of macro 
'__must_be_array'
47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
   |   
^~~
 drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in 
expansion of macro 'ARRAY_SIZE'
   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 
i++) {

  

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

[Stephen Rothwell]

Hi all,

[Just adding Dave to cc's]

On Mon, 12 Oct 2020 15:24:52 +1100 Stephen Rothwell  
wrote:
>
> Hi all,
> 
> On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell  
> wrote:
> >
> > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell  
> > wrote:  
> > >
> > > After merging the drm-misc tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > 
> > In file included from include/linux/clk.h:13,
> >  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 
> > 'ingenic_drm_update_palette':
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
> > 'dma_hwdesc_f0'?
> >   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> >   |   ^~~
> > include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> > __must_be_array(arr))
> >   | ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
> > 'dma_hwdesc_f0'?
> >   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> >   |   ^~~
> > include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> > __must_be_array(arr))
> >   |^~~
> > In file included from include/linux/bits.h:22,
> >  from include/linux/bitops.h:5,
> >  from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
> >  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
> > 'dma_hwdesc_f0'?
> >   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> >   |   ^~~
> > include/linux/build_bug.h:16:62: note: in definition of macro 
> > 'BUILD_BUG_ON_ZERO'
> >16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); 
> > })))
> >   |  ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> >   224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), 
> > &(a)[0]))
> >   |  ^~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> > __must_be_array(arr))
> >   |   
> > ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of 
> > macro 'ARRAY_SIZE'
> >   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> >   |  ^~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct 
> > ingenic_drm' has no member named 'dma_hwdescs'; did you mean 
> > 'dma_hwdesc_f0'?
> >   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> >   |   ^~~
> > include/linux/build_bug.h:16:62: note: in definition of macro 
> > 'BUILD_BUG_ON_ZERO'
> >16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); 
> > })))
> >   |  ^
> > include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
> >   224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), 
> > &(a)[0]))
> >   |  ^~~
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> >47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> > __must_be_array(arr))
> >   |   
> > ^~~
> > drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of 
> > macro 'ARRAY_SIZE'
> >   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
> >   |  ^~
> > include/linux/build_bug.h:16:51: error: bit-field '' width not 
> > an integer constant
> >16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); 
> > })))
> >   |   ^
> > include/linux/compiler.h:224:28: note: in expansion of macro 
> > 'BUILD_BUG_ON_ZERO'
> >   224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), 
> > &(a)[0]))
> >   |^
> > include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
> >47 | #define 

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

[Stephen Rothwell]

Hi all,

On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell  
wrote:
>
> On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell  
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:  
> 
> In file included from include/linux/clk.h:13,
>  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 
> 'ingenic_drm_update_palette':
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
>   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
>   |   ^~~
> include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> __must_be_array(arr))
>   | ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
>   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
>   |   ^~~
> include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> __must_be_array(arr))
>   |^~~
> In file included from include/linux/bits.h:22,
>  from include/linux/bitops.h:5,
>  from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
>  from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
>   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
>   |   ^~~
> include/linux/build_bug.h:16:62: note: in definition of macro 
> 'BUILD_BUG_ON_ZERO'
>16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
>   |  ^
> include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
>   224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), 
> &(a)[0]))
>   |  ^~~
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> __must_be_array(arr))
>   |   
> ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 
> 'ARRAY_SIZE'
>   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
>   |  ^~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
> has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
>   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
>   |   ^~~
> include/linux/build_bug.h:16:62: note: in definition of macro 
> 'BUILD_BUG_ON_ZERO'
>16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
>   |  ^
> include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
>   224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), 
> &(a)[0]))
>   |  ^~~
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> __must_be_array(arr))
>   |   
> ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 
> 'ARRAY_SIZE'
>   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
>   |  ^~
> include/linux/build_bug.h:16:51: error: bit-field '' width not an 
> integer constant
>16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
>   |   ^
> include/linux/compiler.h:224:28: note: in expansion of macro 
> 'BUILD_BUG_ON_ZERO'
>   224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), 
> &(a)[0]))
>   |^
> include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
>47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
> __must_be_array(arr))
>   |   
> ^~~
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 
> 'ARRAY_SIZE'
>   448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); 

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

[Stephen Rothwell]

Hi all,

On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell  
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

In file included from include/linux/clk.h:13,
 from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:10:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c: In function 
'ingenic_drm_update_palette':
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
  448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
  |   ^~~
include/linux/kernel.h:47:33: note: in definition of macro 'ARRAY_SIZE'
   47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
  | ^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
  448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
  |   ^~~
include/linux/kernel.h:47:48: note: in definition of macro 'ARRAY_SIZE'
   47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
  |^~~
In file included from include/linux/bits.h:22,
 from include/linux/bitops.h:5,
 from drivers/gpu/drm/ingenic/ingenic-drm.h:10,
 from drivers/gpu/drm/ingenic/ingenic-drm-drv.c:7:
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
  448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
  |   ^~~
include/linux/build_bug.h:16:62: note: in definition of macro 
'BUILD_BUG_ON_ZERO'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
  |  ^
include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
  224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
  |  ^~~
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
   47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
  |   
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 
'ARRAY_SIZE'
  448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
  |  ^~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:35: error: 'struct ingenic_drm' 
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
  448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
  |   ^~~
include/linux/build_bug.h:16:62: note: in definition of macro 
'BUILD_BUG_ON_ZERO'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
  |  ^
include/linux/compiler.h:224:46: note: in expansion of macro '__same_type'
  224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
  |  ^~~
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
   47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
  |   
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 
'ARRAY_SIZE'
  448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
  |  ^~
include/linux/build_bug.h:16:51: error: bit-field '' width not an 
integer constant
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
  |   ^
include/linux/compiler.h:224:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
  224 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
  |^
include/linux/kernel.h:47:59: note: in expansion of macro '__must_be_array'
   47 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + 
__must_be_array(arr))
  |   
^~~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:448:18: note: in expansion of macro 
'ARRAY_SIZE'
  448 |  for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
  |  ^~
drivers/gpu/drm/ingenic/ingenic-drm-drv.c:453:9: error: 'struct ingenic_drm' 
has no member named 'dma_hwdescs'; did you mean 'dma_hwdesc_f0'?
  453 |   priv->dma_hwdescs->palette[i] = color;
  |

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

[Stephen Rothwell]

Hi all,

On Wed, 26 Aug 2020 10:55:47 +1000 Stephen Rothwell  
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/qxl/qxl_display.c: In function 
> 'qxl_display_read_client_monitors_config':
> include/drm/drm_modeset_lock.h:167:7: error: implicit declaration of function 
> 'drm_drv_uses_atomic_modeset' [-Werror=implicit-function-declaration]
>   167 |  if (!drm_drv_uses_atomic_modeset(dev))\
>   |   ^~~
> drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 
> 'DRM_MODESET_LOCK_ALL_BEGIN'
>   187 |  DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
>   |  ^~
> drivers/gpu/drm/qxl/qxl_display.c:189:35: error: macro 
> "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
>   189 |  DRM_MODESET_LOCK_ALL_END(ctx, ret);
>   |   ^
> In file included from include/drm/drm_crtc.h:36,
>  from include/drm/drm_atomic.h:31,
>  from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" 
> defined here
>   194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\
>   | 
> drivers/gpu/drm/qxl/qxl_display.c:189:2: error: 'DRM_MODESET_LOCK_ALL_END' 
> undeclared (first use in this function)
>   189 |  DRM_MODESET_LOCK_ALL_END(ctx, ret);
>   |  ^~~~
> drivers/gpu/drm/qxl/qxl_display.c:189:2: note: each undeclared identifier is 
> reported only once for each function it appears in
> drivers/gpu/drm/qxl/qxl_display.c:187:2: error: label 'modeset_lock_fail' 
> used but not defined
>   187 |  DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
>   |  ^~
> In file included from include/drm/drm_crtc.h:36,
>  from include/drm/drm_atomic.h:31,
>  from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' 
> defined but not used [-Wunused-label]
>   170 | modeset_lock_retry:   \
>   | ^~
> drivers/gpu/drm/qxl/qxl_display.c:187:2: note: in expansion of macro 
> 'DRM_MODESET_LOCK_ALL_BEGIN'
>   187 |  DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
>   |  ^~
> drivers/gpu/drm/qxl/qxl_display.c: In function 
> 'qxl_framebuffer_surface_dirty':
> drivers/gpu/drm/qxl/qxl_display.c:434:35: error: macro 
> "DRM_MODESET_LOCK_ALL_END" requires 3 arguments, but only 2 given
>   434 |  DRM_MODESET_LOCK_ALL_END(ctx, ret);
>   |   ^
> In file included from include/drm/drm_crtc.h:36,
>  from include/drm/drm_atomic.h:31,
>  from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:194: note: macro "DRM_MODESET_LOCK_ALL_END" 
> defined here
>   194 | #define DRM_MODESET_LOCK_ALL_END(dev, ctx, ret)\
>   | 
> drivers/gpu/drm/qxl/qxl_display.c:434:2: error: 'DRM_MODESET_LOCK_ALL_END' 
> undeclared (first use in this function)
>   434 |  DRM_MODESET_LOCK_ALL_END(ctx, ret);
>   |  ^~~~
> drivers/gpu/drm/qxl/qxl_display.c:411:2: error: label 'modeset_lock_fail' 
> used but not defined
>   411 |  DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, 
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
>   |  ^~
> In file included from include/drm/drm_crtc.h:36,
>  from include/drm/drm_atomic.h:31,
>  from drivers/gpu/drm/qxl/qxl_display.c:29:
> include/drm/drm_modeset_lock.h:170:1: warning: label 'modeset_lock_retry' 
> defined but not used [-Wunused-label]
>   170 | modeset_lock_retry:   \
>   | ^~
> drivers/gpu/drm/qxl/qxl_display.c:411:2: note: in expansion of macro 
> 'DRM_MODESET_LOCK_ALL_BEGIN'
>   411 |  DRM_MODESET_LOCK_ALL_BEGIN(fb->dev, ctx, 
> DRM_MODESET_ACQUIRE_INTERRUPTIBLE, ret);
>   |  ^~
> 
> Caused by commit
> 
>   bbaac1354cc9 ("drm/qxl: Replace deprecated function in qxl_display")
> 
> interacting with commit
> 
>   77ef38574beb ("drm/modeset-lock: Take the modeset BKL for legacy drivers")
> 
> from the drm-misc-fixes tree.
> 
> drivers/gpu/drm/qxl/qxl_display.c manages to include
> drm/drm_modeset_lock.h by some indirect route, but fails to have
> drm/drm_drv.h similarly included.  In fact, drm/drm_modeset_lock.h should
> have included drm/drm_drv.h since it uses things declared there, and
> drivers/gpu/drm/qxl/qxl_display.c should include drm/drm_modeset_lock.h
> similarly.
> 
> I have added the following hack patch for today.
> 
> From: Stephen Rothwell 
> Date: Wed, 26 Aug 2020 10:40:18 +1000
> Subject: [PATCH] fix interaction with drm-misc-fix commit
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/gpu/drm/qxl/qxl_display.c | 5 +++--
>  

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

[Stephen Rothwell]

Hi Dave,

On Wed, 24 Jun 2020 15:47:49 +1000 Dave Airlie  wrote:
>
> My bad, my local builds passed, as I had made the change but forgot
> the commit --amend
> 
> Pushed out a new head with it in it now.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell


pgpwhIJQqFVu5.pgp
Description: OpenPGP digital signature

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

[Dave Airlie]

On Wed, 24 Jun 2020 at 11:36, Stephen Rothwell  wrote:
>
> Hi all,
>
> On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell  
> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 
> > 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit 
> > declaration of function 'drm_gem_object_put_unlocked'; did you mean 
> > 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
> >  1357 |  drm_gem_object_put_unlocked(>bo->tbo.base);
> >   |  ^~~
> >   |  drm_gem_object_put_locked
> >
> > Caused by commit
> >
> >   ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
> >
> > interacting with commit
> >
> >   fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
> >
> > from Linus' tree.
> >
> > I have applied the following merge fix up patch for today.
> >
> > From: Stephen Rothwell 
> > Date: Wed, 17 Jun 2020 10:55:32 +1000
> > Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
> >
> > Signed-off-by: Stephen Rothwell 
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
> > b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > index b91b5171270f..9015c7b76d60 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> > @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
> >   }
> >
> >   /* Free the BO*/
> > - drm_gem_object_put_unlocked(>bo->tbo.base);
> > + drm_gem_object_put(>bo->tbo.base);
> >   mutex_destroy(>lock);
> >   kfree(mem);
> >
> > --
> > 2.26.2
>
> This fix is now needed when I merge the drm tree :-(
>
> Given that the drm tree is based on v5.8-rc2 and the commit from Linus'
> tree above was merged before v5.8-rc1, the above patch should be
> applied to the drm tree (and should have been part of the patch that
> merged the drm-misc tree).  I am a bit suprised that the drm tree
> currently passes CI.

My bad, my local builds passed, as I had made the change but forgot
the commit --amend

Pushed out a new head with it in it now.

Dave.

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

[Stephen Rothwell]

Hi all,

On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell  
wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 
> 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit 
> declaration of function 'drm_gem_object_put_unlocked'; did you mean 
> 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
>  1357 |  drm_gem_object_put_unlocked(>bo->tbo.base);
>   |  ^~~
>   |  drm_gem_object_put_locked
> 
> Caused by commit
> 
>   ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
> 
> interacting with commit
> 
>   fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
> 
> from Linus' tree.
> 
> I have applied the following merge fix up patch for today.
> 
> From: Stephen Rothwell 
> Date: Wed, 17 Jun 2020 10:55:32 +1000
> Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index b91b5171270f..9015c7b76d60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
>   }
>  
>   /* Free the BO*/
> - drm_gem_object_put_unlocked(>bo->tbo.base);
> + drm_gem_object_put(>bo->tbo.base);
>   mutex_destroy(>lock);
>   kfree(mem);
>  
> -- 
> 2.26.2

This fix is now needed when I merge the drm tree :-(

Given that the drm tree is based on v5.8-rc2 and the commit from Linus'
tree above was merged before v5.8-rc1, the above patch should be
applied to the drm tree (and should have been part of the patch that
merged the drm-misc tree).  I am a bit suprised that the drm tree
currently passes CI.

Sorry, Dave, for not cc'ing you in the original report.

-- 
Cheers,
Stephen Rothwell


pgpku9GIm1eol.pgp
Description: OpenPGP digital signature

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

[Emil Velikov]

Hi Stephen,

On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell  wrote:
>
> Hi Thomas,
>
> On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann  
> wrote:
> >
> > We recently dropped the _unlock() suffix from drm_gem_object_put(). This
> > patch should be ok.
>
> Yes, but what it shows is that the drm-misc tree is still based on
> v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get
> conflicts against :-)
>
Being the culprit here - thanks for the patience and report.

I believe that both AMD and drm-misc teams are aware of this lovely
situation I've put them in.
As you mentioned drm-misc is a bit special and doing the usual
backmerge will be fun.

If you have any tips on how to minimise such issues, I'd gladly utilise them.

Thanks again,
-Emil

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

[Stephen Rothwell]

Hi Thomas,

On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann  
wrote:
>
> We recently dropped the _unlock() suffix from drm_gem_object_put(). This
> patch should be ok.

Yes, but what it shows is that the drm-misc tree is still based on
v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get
conflicts against :-)

-- 
Cheers,
Stephen Rothwell


pgpSoBOu__tZi.pgp
Description: OpenPGP digital signature

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

[Thomas Zimmermann]

Hi

Am 17.06.20 um 02:59 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/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 
> 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu':
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit 
> declaration of function 'drm_gem_object_put_unlocked'; did you mean 
> 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration]
>  1357 |  drm_gem_object_put_unlocked(>bo->tbo.base);
>   |  ^~~
>   |  drm_gem_object_put_locked
> 
> Caused by commit
> 
>   ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
> 
> interacting with commit
> 
>   fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
> 
> from Linus' tree.
> 
> I have applied the following merge fix up patch for today.
> 
> From: Stephen Rothwell 
> Date: Wed, 17 Jun 2020 10:55:32 +1000
> Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index b91b5171270f..9015c7b76d60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(
>   }
>  
>   /* Free the BO*/
> - drm_gem_object_put_unlocked(>bo->tbo.base);
> + drm_gem_object_put(>bo->tbo.base);

We recently dropped the _unlock() suffix from drm_gem_object_put(). This
patch should be ok.

Best regards
Thomas

>   mutex_destroy(>lock);
>   kfree(mem);
>  
> 
> 
> ___
> dri-devel mailing list
> dri-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer



signature.asc
Description: OpenPGP digital signature

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

[Bartlomiej Zolnierkiewicz]

On 4/29/20 10:09 AM, Bartlomiej Zolnierkiewicz wrote:
> 
> Hi Stephen,
> 
> On 4/29/20 12:33 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell  
>> wrote:
>>>
>>> After merging the drm-misc tree, today's linux-next build (powerpc
>>> allyesconfig) failed like this:
>>>
>>> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
>>> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of 
>>> function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? 
>>> [-Werror=implicit-function-declaration]
>>>   756 |   vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
>>>   |   ^~~
>>>   |   pgprot_cached
>>> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when 
>>> assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
>>>
>>> Presumably exposed by commit
>>>
>>>   a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>>>
>>> I just turned off COMPILE_TEST again for today.  Please let me know when
>>> this is fixed.
>>
>> This still appears to have not been addressed.
> 
> Sorry for the delay, I've just posted a patch (also included below):
> 
> "[PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y 
> && PPC32=n"
> 
> which should fix it.
> 
> Please verify it, thank you!

I have tested it with powerpc allyesconfig now and it adds one dependency too 
much,
fixed in v2:

https://lore.kernel.org/lkml/fe520316-3863-e6c4-9581-5d709f49e...@samsung.com/

Sam, could you please review / merge it to drm-misc-next?

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R Institute Poland
Samsung Electronics

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

[Bartlomiej Zolnierkiewicz]

Hi Stephen,

On 4/29/20 12:33 AM, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell  
> wrote:
>>
>> After merging the drm-misc tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>>
>> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
>> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of 
>> function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? 
>> [-Werror=implicit-function-declaration]
>>   756 |   vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
>>   |   ^~~
>>   |   pgprot_cached
>> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when 
>> assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
>>
>> Presumably exposed by commit
>>
>>   a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
>>
>> I just turned off COMPILE_TEST again for today.  Please let me know when
>> this is fixed.
> 
> This still appears to have not been addressed.

Sorry for the delay, I've just posted a patch (also included below):

"[PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && PPC_PMAC=y && 
PPC32=n"

which should fix it.

Please verify it, thank you!

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R Institute Poland
Samsung Electronics


From: Bartlomiej Zolnierkiewicz 
Subject: [PATCH] video: fbdev: controlfb: fix build for COMPILE_TEST=y && 
PPC_PMAC=y && PPC32=n

powerpc allyesconfig fails like this:

drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of function 
'pgprot_cached_wthru'; did you mean 'pgprot_cached'? 
[-Werror=implicit-function-declaration]
  756 |   vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
  |   ^~~
  |   pgprot_cached
drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when 
assigning to type 'pgprot_t' {aka 'struct '} from type 'int'

Fix it by adding missing PPC32 dependency.

Fixes: a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
Reported-by: Stephen Rothwell 
Reported-by: kbuild test robot 
Cc: Sam Ravnborg 
Cc: Daniel Vetter 
Signed-off-by: Bartlomiej Zolnierkiewicz 
---
 drivers/video/fbdev/controlfb.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/drivers/video/fbdev/controlfb.c
===
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -47,7 +47,7 @@
 #include 
 #include 
 #include 
-#ifdef CONFIG_PPC_PMAC
+#if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
 #include 
 #include 
 #endif
@@ -55,7 +55,7 @@
 #include "macmodes.h"
 #include "controlfb.h"
 
-#ifndef CONFIG_PPC_PMAC
+#if !defined(CONFIG_PPC_PMAC) || !defined(CONFIG_PPC32)
 #define invalid_vram_cache(addr)
 #undef in_8
 #undef out_8

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

[Stephen Rothwell]

Hi all,

On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell  
wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/video/fbdev/controlfb.c: In function 'controlfb_mmap':
> drivers/video/fbdev/controlfb.c:756:23: error: implicit declaration of 
> function 'pgprot_cached_wthru'; did you mean 'pgprot_cached'? 
> [-Werror=implicit-function-declaration]
>   756 |   vma->vm_page_prot = pgprot_cached_wthru(vma->vm_page_prot);
>   |   ^~~
>   |   pgprot_cached
> drivers/video/fbdev/controlfb.c:756:23: error: incompatible types when 
> assigning to type 'pgprot_t' {aka 'struct '} from type 'int'
> 
> Presumably exposed by commit
> 
>   a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
> 
> I just turned off COMPILE_TEST again for today.  Please let me know when
> this is fixed.

This still appears to have not been addressed.

-- 
Cheers,
Stephen Rothwell


pgpXfAO_67W2i.pgp
Description: OpenPGP digital signature

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  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 
>   |  ^~~~
>
> 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 
> 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 
> ---
>  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 
> +#include 
> +
> +#include 
> +
>  #include "amdgpu.h"
>  #include "amdgpu_tmz.h"
>
> --
> 2.23.0
>
> --
> Cheers,
> Stephen Rothwell

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 

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 3:57 PM Daniel Vetter  wrote:
>
> On Tue, Apr 02, 2019 at 01:55:03PM +0800, Qiang Yu wrote:
> > Thanks, patch is:
> > Reviewed-by: Qiang Yu 
>
> 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  
> > 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(>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(>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 
> > > Date: Tue, 2 Apr 2019 10:45:32 +1100
> > > Subject: [PATCH] drm/lima: update for xa_alloc API change
> > >
> > > Signed-off-by: Stephen Rothwell 
> > > ---
> > >  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(>handles, id, UINT_MAX, ctx, GFP_KERNEL);
> > > +   err = xa_alloc(>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

[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

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

[Stephen Rothwell]

Hi Daniel,

On Tue, 8 Jan 2019 09:37:22 +0100 Daniel Vetter  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


pgppntbji2VJz.pgp
Description: OpenPGP digital signature

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(>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]
>>   >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]
>>   _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(>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 

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

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(>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]
>  >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]
>  _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(>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

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

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  
> wrote:
> > Hi Daniel,
> >
> > On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter  
> > 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

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  
> wrote:
> > Hi Daniel,
> >
> > On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter  
> > 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

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  wrote:
> Hi Daniel,
>
> On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter  
> 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

[Daniel Vetter]

On Mon, Jul 24, 2017 at 2:03 AM, Stephen Rothwell  wrote:
> Hi Daniel,
>
> On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter  
> 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

[Stephen Rothwell]

Hi Daniel,

On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter  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

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

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,

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

[Hans de Goede]

Hi,

On 21-07-17 09:24, Daniel Vetter wrote:

Hi Greg,

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

[Daniel Vetter]

Hi Greg,

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  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  
> 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(, _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(, _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 
>> 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 
>> ---
>>  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 = _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(, _pci_driver);
>> + return pci_register_driver(_pci_driver);
>>  }
>>
>>  static void __exit vbox_exit(void)
>>  {
>> - drm_pci_exit(, _pci_driver);
>> + pci_unregister_driver(_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

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

[Daniel Vetter]

Hi Greg,

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  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  
> 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(, _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(, _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 
>> 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 
>> ---
>>  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 = _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(, _pci_driver);
>> + return pci_register_driver(_pci_driver);
>>  }
>>
>>  static void __exit vbox_exit(void)
>>  {
>> - drm_pci_exit(, _pci_driver);
>> + pci_unregister_driver(_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

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  
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(, _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(, _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 
> 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 
> ---
>  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 = _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(, _pci_driver);
> + return pci_register_driver(_pci_driver);
>  }
>  
>  static void __exit vbox_exit(void)
>  {
> - drm_pci_exit(, _pci_driver);
> + pci_unregister_driver(_pci_driver);
>  }
>  
>  module_init(vbox_init);
> -- 
> 2.13.2

-- 
Cheers,
Stephen Rothwell

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  
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(, _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(, _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 
> 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 
> ---
>  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 = _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(, _pci_driver);
> + return pci_register_driver(_pci_driver);
>  }
>  
>  static void __exit vbox_exit(void)
>  {
> - drm_pci_exit(, _pci_driver);
> + pci_unregister_driver(_pci_driver);
>  }
>  
>  module_init(vbox_init);
> -- 
> 2.13.2

-- 
Cheers,
Stephen Rothwell

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

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

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  wrote:
> On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell  
> wrote:
>> Hi Daniel,
>>
>> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter  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

[Daniel Vetter]

On Tue, May 2, 2017 at 10:55 AM, Arnd Bergmann  wrote:
> On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell  
> wrote:
>> Hi Daniel,
>>
>> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter  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

[Arnd Bergmann]

On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell  wrote:
> Hi Daniel,
>
> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter  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

[Arnd Bergmann]

On Tue, May 2, 2017 at 10:41 AM, Stephen Rothwell  wrote:
> Hi Daniel,
>
> On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter  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

[Stephen Rothwell]

Hi Daniel,

On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter  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

[Stephen Rothwell]

Hi Daniel,

On Tue, 2 May 2017 10:25:18 +0200 Daniel Vetter  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

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

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

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

[Stephen Rothwell]

Hi all,

On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell  
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 
> 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 
> ---
>  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

[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 
> 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 
> ---
>  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,
>  };
>  
> 

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 
> 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 
> ---
>  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,
>  };
>  
> 

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 

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

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 

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

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
>  rather than in .
> 
> 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 
> Signed-off-by: Lukas Wunner 
> ---
>  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

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
 rather than in .

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 
Signed-off-by: Lukas Wunner 
---
 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)

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

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
>  rather than in .
> 
> 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 
> Signed-off-by: Lukas Wunner 
> ---
>  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

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

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
 rather than in .

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 
Signed-off-by: Lukas Wunner 
---
 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)

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

[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

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

Re: linux-next: build failure after merge of the 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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  
> > 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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  
> > 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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  
> 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);

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

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

[Stephen Rothwell]

Hi all,

On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell  
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 Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

[Stephen Rothwell]

Hi all,

On Thu, 3 Sep 2015 10:49:19 +1000 Stephen Rothwell  
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 Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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  
> 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);

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

Re: linux-next: build failure after merge of the 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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 
> 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 

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



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: build failure after merge of the 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 s...@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 s...@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 Rothwells...@canb.auug.org.au



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/