linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the amdgpu tree
@ 2021-07-28 12:34 Mark Brown
  0 siblings, 0 replies; 109+ messages in thread
From: Mark Brown @ 2021-07-28 12:34 UTC (permalink / raw)
  To: Alex Deucher, Christian König, Pan Xinhui, Leung Martin,
	Solomon Chiu, Mark Morra, Daniel Wheeler
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, amd-gfx, dri-devel

Hi all,

After merging the amdgpu tree, today's linux-next build (x86
allmodconfig) failed like this:

ERROR: modpost: "dc_dsc_stream_bandwidth_in_kbps" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

Probably caused by commit

  b6b76b0315ed7b ("drm/amd/display: Fixed EdidUtility build errors")

I've reverted to Monday's tree.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-07-27 16:21 ` Rodrigo Siqueira Jordao
@ 2022-07-27 16:23   ` Alex Deucher
  0 siblings, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2022-07-27 16:23 UTC (permalink / raw)
  To: Rodrigo Siqueira Jordao
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List

On Wed, Jul 27, 2022 at 12:21 PM Rodrigo Siqueira Jordao
<Rodrigo.Siqueira@amd.com> wrote:
>
>
>
> On 2022-07-25 07:16, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_crtc.c:297:26: error: 'amdgpu_dm_crtc_late_register' undeclared here (not in a function); did you mean 'amdgpu_umc_ras_late_init'?
> >    297 |         .late_register = amdgpu_dm_crtc_late_register,
> >        |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >        |                          amdgpu_umc_ras_late_init
> >
> > Caused by commit
> >
> >    a6c0b96cb899 ("drm/amd/display: Create a file dedicated for CRTC")
> >
> > I have applied the following hack for today (just to make it build).
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 25 Jul 2022 20:48:29 +1000
> > Subject: [PATCH] fixup for "drm/amd/display: Create a file dedicated for CRTC"
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> > index 16b624828e0d..3eb6ea3709bc 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> > @@ -293,7 +293,7 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
> >       .enable_vblank = dm_enable_vblank,
> >       .disable_vblank = dm_disable_vblank,
> >       .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp,
> > -#if defined(CONFIG_DEBUG_FS)
> > +#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY
>
> I guess we had a merge issue here?
>
> If you check the original patch [1,2], you will see:
>
> +#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
> +       .late_register = amdgpu_dm_crtc_late_register,
> +#endif
>
> Anyway, maybe you want to use the above code to keep both branches in sync.
>
> 1.
> https://lore.kernel.org/amd-gfx/20220715181705.1030401-10-Rodrigo.Siqueira@amd.com/
> 2.
> https://gitlab.freedesktop.org/agd5f/linux/-/blob/amd-staging-drm-next/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c#L297
>

There was a conflict with another patch in drm-misc that changed this
code.  I'ved fixed it up properly in my drm-next branch.

Alex

> Thanks
> Siqueira
>
> >       .late_register = amdgpu_dm_crtc_late_register,
> >   #endif
> >   };
>

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-07-25 11:16 Stephen Rothwell
@ 2022-07-27 16:21 ` Rodrigo Siqueira Jordao
  2022-07-27 16:23   ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Rodrigo Siqueira Jordao @ 2022-07-27 16:21 UTC (permalink / raw)
  To: Stephen Rothwell, Alex Deucher
  Cc: Linux Kernel Mailing List, Linux Next Mailing List



On 2022-07-25 07:16, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_crtc.c:297:26: error: 'amdgpu_dm_crtc_late_register' undeclared here (not in a function); did you mean 'amdgpu_umc_ras_late_init'?
>    297 |         .late_register = amdgpu_dm_crtc_late_register,
>        |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>        |                          amdgpu_umc_ras_late_init
> 
> Caused by commit
> 
>    a6c0b96cb899 ("drm/amd/display: Create a file dedicated for CRTC")
> 
> I have applied the following hack for today (just to make it build).
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 25 Jul 2022 20:48:29 +1000
> Subject: [PATCH] fixup for "drm/amd/display: Create a file dedicated for CRTC"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> index 16b624828e0d..3eb6ea3709bc 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> @@ -293,7 +293,7 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
>   	.enable_vblank = dm_enable_vblank,
>   	.disable_vblank = dm_disable_vblank,
>   	.get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp,
> -#if defined(CONFIG_DEBUG_FS)
> +#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY

I guess we had a merge issue here?

If you check the original patch [1,2], you will see:

+#if defined(CONFIG_DRM_AMD_SECURE_DISPLAY)
+	.late_register = amdgpu_dm_crtc_late_register,
+#endif

Anyway, maybe you want to use the above code to keep both branches in sync.

1. 
https://lore.kernel.org/amd-gfx/20220715181705.1030401-10-Rodrigo.Siqueira@amd.com/
2. 
https://gitlab.freedesktop.org/agd5f/linux/-/blob/amd-staging-drm-next/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c#L297

Thanks
Siqueira

>   	.late_register = amdgpu_dm_crtc_late_register,
>   #endif
>   };


^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-07-25 11:16 Stephen Rothwell
  2022-07-27 16:21 ` Rodrigo Siqueira Jordao
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-07-25 11:16 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Rodrigo Siqueira, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_crtc.c:297:26: error: 'amdgpu_dm_crtc_late_register' undeclared here (not in a function); did you mean 'amdgpu_umc_ras_late_init'?
  297 |         .late_register = amdgpu_dm_crtc_late_register,
      |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                          amdgpu_umc_ras_late_init

Caused by commit

  a6c0b96cb899 ("drm/amd/display: Create a file dedicated for CRTC")

I have applied the following hack for today (just to make it build).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 Jul 2022 20:48:29 +1000
Subject: [PATCH] fixup for "drm/amd/display: Create a file dedicated for CRTC"

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

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
index 16b624828e0d..3eb6ea3709bc 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
@@ -293,7 +293,7 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
 	.enable_vblank = dm_enable_vblank,
 	.disable_vblank = dm_disable_vblank,
 	.get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp,
-#if defined(CONFIG_DEBUG_FS)
+#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY
 	.late_register = amdgpu_dm_crtc_late_register,
 #endif
 };
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-07-22  2:52     ` Stephen Rothwell
@ 2022-07-22 13:30       ` Alex Deucher
  0 siblings, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2022-07-22 13:30 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

On Thu, Jul 21, 2022 at 10:52 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Thu, 21 Jul 2022 12:16:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > On Wed, 20 Jul 2022 12:47:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: error: the frame size of 2464 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> > > >  3799 | } // ModeSupportAndSystemConfigurationFull
> > > >       | ^
> > >
> > > This is still here, but the frame size is down to 2336.
> >
> > Today it is down to 2128.
>
> And today we are back up to 2152.  I can only imagine that maybe things
> are being inlined?

This is driving me crazy, there is almost nothing left on the stack at
this point.

Alex

>
> My compiler (in case it matters):
>
> $ x86_64-linux-gnu-gcc --version
> x86_64-linux-gnu-gcc (Debian 11.2.0-9) 11.2.0
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-07-21  2:16   ` Stephen Rothwell
@ 2022-07-22  2:52     ` Stephen Rothwell
  2022-07-22 13:30       ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-07-22  2:52 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

On Thu, 21 Jul 2022 12:16:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> On Wed, 20 Jul 2022 12:47:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >   
> > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: error: the frame size of 2464 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> > >  3799 | } // ModeSupportAndSystemConfigurationFull
> > >       | ^    
> > 
> > This is still here, but the frame size is down to 2336.  
> 
> Today it is down to 2128.

And today we are back up to 2152.  I can only imagine that maybe things
are being inlined?

My compiler (in case it matters):

$ x86_64-linux-gnu-gcc --version
x86_64-linux-gnu-gcc (Debian 11.2.0-9) 11.2.0

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-07-20  2:47 ` Stephen Rothwell
@ 2022-07-21  2:16   ` Stephen Rothwell
  2022-07-22  2:52     ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-07-21  2:16 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

On Wed, 20 Jul 2022 12:47:32 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: error: the frame size of 2464 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> >  3799 | } // ModeSupportAndSystemConfigurationFull
> >       | ^  
> 
> This is still here, but the frame size is down to 2336.

Today it is down to 2128.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-07-19  2:36 Stephen Rothwell
@ 2022-07-20  2:47 ` Stephen Rothwell
  2022-07-21  2:16   ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-07-20  2:47 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

On Tue, 19 Jul 2022 12:36:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerformanceCalculation':
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:1659:1: error: the frame size of 2144 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>  1659 | }
>       | ^

The above is fixed today.

> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: error: the frame size of 2464 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>  3799 | } // ModeSupportAndSystemConfigurationFull
>       | ^

This is still here, but the frame size is down to 2336.

> Using the amdgpu tree from next-20220718 fixes the problem, so I have
> done that for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-07-19  2:36 Stephen Rothwell
  2022-07-20  2:47 ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-07-19  2:36 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerformanceCalculation':
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:1659:1: error: the frame size of 2144 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
 1659 | }
      | ^
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: error: the frame size of 2464 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
 3799 | } // ModeSupportAndSystemConfigurationFull
      | ^
cc1: all warnings being treated as errors

I can't see anything obvious that caused this.  The second one was
previously fixed by commit

  01cf387b1c7f ("drm/amdgpu/display: reduce stack size in dml32_ModeSupportAndSystemConfigurationFull()")

Usinf the amdgpu tree from next-20220718 fixes the problem, so I have
done that for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-23  6:07 Stephen Rothwell
  2022-06-23 11:01 ` Greg KH
@ 2022-06-27 14:40 ` Greg KH
  1 sibling, 0 replies; 109+ messages in thread
From: Greg KH @ 2022-06-27 14:40 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Somalapuram Amaranath, Duoming Zhou, Dave Airlie,
	Linux Kernel Mailing List, Linux Next Mailing List

On Thu, Jun 23, 2022 at 04:07:23PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/radix-tree.h:12,
>                  from include/linux/idr.h:15,
>                  from include/linux/kernfs.h:12,
>                  from include/linux/sysfs.h:16,
>                  from include/linux/kobject.h:20,
>                  from include/linux/energy_model.h:7,
>                  from include/linux/device.h:16,
>                  from include/linux/power_supply.h:15,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:28:
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c: In function 'amdgpu_reset_capture_coredumpm':
> include/linux/gfp.h:337:25: error: passing argument 5 of 'dev_coredumpm' makes pointer from integer without a cast [-Werror=int-conversion]
>   337 | #define GFP_KERNEL      (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |                         |
>       |                         unsigned int
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4726:55: note: in expansion of macro 'GFP_KERNEL'
>  4726 |         dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
>       |                                                       ^~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
> include/linux/devcoredump.h:59:30: note: expected 'ssize_t (*)(char *, loff_t,  size_t,  void *, size_t)' {aka 'long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)'} but argument is of type 'unsigned int'
>    59 |                    ssize_t (*read)(char *buffer, loff_t offset, size_t count,
>       |                    ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    60 |                                    void *data, size_t datalen),
>       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4727:23: error: passing argument 6 of 'dev_coredumpm' from incompatible pointer type [-Werror=incompatible-pointer-types]
>  4727 |                       amdgpu_devcoredump_read, amdgpu_devcoredump_free);
>       |                       ^~~~~~~~~~~~~~~~~~~~~~~
>       |                       |
>       |                       ssize_t (*)(char *, loff_t,  size_t,  void *, size_t) {aka long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)}
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
> include/linux/devcoredump.h:61:27: note: expected 'void (*)(void *)' but argument is of type 'ssize_t (*)(char *, loff_t,  size_t,  void *, size_t)' {aka 'long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)'}
>    61 |                    void (*free)(void *data));
>       |                    ~~~~~~~^~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4726:9: error: too many arguments to function 'dev_coredumpm'
>  4726 |         dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
>       |         ^~~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
> include/linux/devcoredump.h:57:6: note: declared here
>    57 | void dev_coredumpm(struct device *dev, struct module *owner,
>       |      ^~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   3d8785f6c04a ("drm/amdgpu: adding device coredump support")
> 
> interacting with commit
> 
>   77515ebaf019 ("devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm")
> 
> from the driver-core tree.
> 
> I have applied the following merge resolution patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 23 Jun 2022 15:56:22 +1000
> Subject: [PATCH] fix up for "devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm"
> 
> interacting with
> 
>   3d8785f6c04a ("drm/amdgpu: adding device coredump support")
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Sorry for the delay, the driver-core tree has now reverted this, so all
should be good.

greg k-h

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-23  6:07 Stephen Rothwell
@ 2022-06-23 11:01 ` Greg KH
  2022-06-27 14:40 ` Greg KH
  1 sibling, 0 replies; 109+ messages in thread
From: Greg KH @ 2022-06-23 11:01 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Somalapuram Amaranath, Duoming Zhou, Dave Airlie,
	Linux Kernel Mailing List, Linux Next Mailing List

On Thu, Jun 23, 2022 at 04:07:23PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from include/linux/radix-tree.h:12,
>                  from include/linux/idr.h:15,
>                  from include/linux/kernfs.h:12,
>                  from include/linux/sysfs.h:16,
>                  from include/linux/kobject.h:20,
>                  from include/linux/energy_model.h:7,
>                  from include/linux/device.h:16,
>                  from include/linux/power_supply.h:15,
>                  from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:28:
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c: In function 'amdgpu_reset_capture_coredumpm':
> include/linux/gfp.h:337:25: error: passing argument 5 of 'dev_coredumpm' makes pointer from integer without a cast [-Werror=int-conversion]
>   337 | #define GFP_KERNEL      (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |                         |
>       |                         unsigned int
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4726:55: note: in expansion of macro 'GFP_KERNEL'
>  4726 |         dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
>       |                                                       ^~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
> include/linux/devcoredump.h:59:30: note: expected 'ssize_t (*)(char *, loff_t,  size_t,  void *, size_t)' {aka 'long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)'} but argument is of type 'unsigned int'
>    59 |                    ssize_t (*read)(char *buffer, loff_t offset, size_t count,
>       |                    ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    60 |                                    void *data, size_t datalen),
>       |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4727:23: error: passing argument 6 of 'dev_coredumpm' from incompatible pointer type [-Werror=incompatible-pointer-types]
>  4727 |                       amdgpu_devcoredump_read, amdgpu_devcoredump_free);
>       |                       ^~~~~~~~~~~~~~~~~~~~~~~
>       |                       |
>       |                       ssize_t (*)(char *, loff_t,  size_t,  void *, size_t) {aka long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)}
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
> include/linux/devcoredump.h:61:27: note: expected 'void (*)(void *)' but argument is of type 'ssize_t (*)(char *, loff_t,  size_t,  void *, size_t)' {aka 'long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)'}
>    61 |                    void (*free)(void *data));
>       |                    ~~~~~~~^~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4726:9: error: too many arguments to function 'dev_coredumpm'
>  4726 |         dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
>       |         ^~~~~~~~~~~~~
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
> include/linux/devcoredump.h:57:6: note: declared here
>    57 | void dev_coredumpm(struct device *dev, struct module *owner,
>       |      ^~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   3d8785f6c04a ("drm/amdgpu: adding device coredump support")
> 
> interacting with commit
> 
>   77515ebaf019 ("devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm")
> 
> from the driver-core tree.
> 
> I have applied the following merge resolution patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 23 Jun 2022 15:56:22 +1000
> Subject: [PATCH] fix up for "devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm"
> 
> interacting with
> 
>   3d8785f6c04a ("drm/amdgpu: adding device coredump support")
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index f2a4c268ac72..9d6418bb963e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -4723,7 +4723,7 @@ static void amdgpu_reset_capture_coredumpm(struct amdgpu_device *adev)
>  	struct drm_device *dev = adev_to_drm(adev);
>  
>  	ktime_get_ts64(&adev->reset_time);
> -	dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
> +	dev_coredumpm(dev->dev, THIS_MODULE, adev, 0,
>  		      amdgpu_devcoredump_read, amdgpu_devcoredump_free);
>  }
>  #endif

Ok, this isn't going to work as-is.  I'll go revert this patch (and the
other one) from my tree and then request this to be done in a way that
does not break anyone going forward, if possible...

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-22 14:48         ` Alex Deucher
@ 2022-06-23  7:47           ` Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-23  7:47 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi Alex,

On Wed, 22 Jun 2022 10:48:50 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> Thanks.  I think I fixed it.  Patch sent out.

Yes, that got it.  Thanks.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-06-23  6:07 Stephen Rothwell
  2022-06-23 11:01 ` Greg KH
  2022-06-27 14:40 ` Greg KH
  0 siblings, 2 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-23  6:07 UTC (permalink / raw)
  To: Alex Deucher, Greg KH
  Cc: Somalapuram Amaranath, Duoming Zhou, Greg Kroah-Hartman,
	Dave Airlie, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

In file included from include/linux/radix-tree.h:12,
                 from include/linux/idr.h:15,
                 from include/linux/kernfs.h:12,
                 from include/linux/sysfs.h:16,
                 from include/linux/kobject.h:20,
                 from include/linux/energy_model.h:7,
                 from include/linux/device.h:16,
                 from include/linux/power_supply.h:15,
                 from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:28:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c: In function 'amdgpu_reset_capture_coredumpm':
include/linux/gfp.h:337:25: error: passing argument 5 of 'dev_coredumpm' makes pointer from integer without a cast [-Werror=int-conversion]
  337 | #define GFP_KERNEL      (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                         |
      |                         unsigned int
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4726:55: note: in expansion of macro 'GFP_KERNEL'
 4726 |         dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
      |                                                       ^~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
include/linux/devcoredump.h:59:30: note: expected 'ssize_t (*)(char *, loff_t,  size_t,  void *, size_t)' {aka 'long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)'} but argument is of type 'unsigned int'
   59 |                    ssize_t (*read)(char *buffer, loff_t offset, size_t count,
      |                    ~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   60 |                                    void *data, size_t datalen),
      |                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4727:23: error: passing argument 6 of 'dev_coredumpm' from incompatible pointer type [-Werror=incompatible-pointer-types]
 4727 |                       amdgpu_devcoredump_read, amdgpu_devcoredump_free);
      |                       ^~~~~~~~~~~~~~~~~~~~~~~
      |                       |
      |                       ssize_t (*)(char *, loff_t,  size_t,  void *, size_t) {aka long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)}
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
include/linux/devcoredump.h:61:27: note: expected 'void (*)(void *)' but argument is of type 'ssize_t (*)(char *, loff_t,  size_t,  void *, size_t)' {aka 'long int (*)(char *, long long int,  long unsigned int,  void *, long unsigned int)'}
   61 |                    void (*free)(void *data));
      |                    ~~~~~~~^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4726:9: error: too many arguments to function 'dev_coredumpm'
 4726 |         dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
      |         ^~~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:35:
include/linux/devcoredump.h:57:6: note: declared here
   57 | void dev_coredumpm(struct device *dev, struct module *owner,
      |      ^~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  3d8785f6c04a ("drm/amdgpu: adding device coredump support")

interacting with commit

  77515ebaf019 ("devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm")

from the driver-core tree.

I have applied the following merge resolution patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 23 Jun 2022 15:56:22 +1000
Subject: [PATCH] fix up for "devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm"

interacting with

  3d8785f6c04a ("drm/amdgpu: adding device coredump support")

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index f2a4c268ac72..9d6418bb963e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4723,7 +4723,7 @@ static void amdgpu_reset_capture_coredumpm(struct amdgpu_device *adev)
 	struct drm_device *dev = adev_to_drm(adev);
 
 	ktime_get_ts64(&adev->reset_time);
-	dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_KERNEL,
+	dev_coredumpm(dev->dev, THIS_MODULE, adev, 0,
 		      amdgpu_devcoredump_read, amdgpu_devcoredump_free);
 }
 #endif
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-21 22:07       ` Stephen Rothwell
@ 2022-06-22 14:48         ` Alex Deucher
  2022-06-23  7:47           ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2022-06-22 14:48 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

On Tue, Jun 21, 2022 at 6:07 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Alex,
>
> On Tue, 21 Jun 2022 11:02:30 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
> >
> > On Tue, Jun 21, 2022 at 4:15 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Wed, 15 Jun 2022 15:00:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > On Fri, 3 Jun 2022 14:43:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > After merging the amdgpu tree, today's linux-next build (powerpc
> > > > > allyesconfig) failed like this:
> > > > >
> > > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> > > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3835:1: error: the frame size of 2752 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> > > > >  3835 | } // ModeSupportAndSystemConfigurationFull
> > > > >       | ^
> > > > > cc1: all warnings being treated as errors
> > > >
> > > > I am still getting the above failure.
> > >
> > > I am still getting the above failure ... it has now been 19 days :-(
> >
> > Is it still the same error or something else?  I thought this was
> > fixed in this patch:
> > https://gitlab.freedesktop.org/agd5f/linux/-/commit/d6aa8424bcac64b2608452589c9a09984251c01c
>
> Here is the message I got yesterday:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3833:1: error: the frame size of 2720 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>  3833 | } // ModeSupportAndSystemConfigurationFull
>       | ^
>

Thanks.  I think I fixed it.  Patch sent out.

Alex

> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-21 15:02     ` Alex Deucher
@ 2022-06-21 22:07       ` Stephen Rothwell
  2022-06-22 14:48         ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-21 22:07 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi Alex,

On Tue, 21 Jun 2022 11:02:30 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> On Tue, Jun 21, 2022 at 4:15 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Wed, 15 Jun 2022 15:00:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > On Fri, 3 Jun 2022 14:43:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > > >
> > > > After merging the amdgpu tree, today's linux-next build (powerpc
> > > > allyesconfig) failed like this:
> > > >
> > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> > > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3835:1: error: the frame size of 2752 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> > > >  3835 | } // ModeSupportAndSystemConfigurationFull
> > > >       | ^
> > > > cc1: all warnings being treated as errors  
> > >
> > > I am still getting the above failure.  
> >
> > I am still getting the above failure ... it has now been 19 days :-(  
> 
> Is it still the same error or something else?  I thought this was
> fixed in this patch:
> https://gitlab.freedesktop.org/agd5f/linux/-/commit/d6aa8424bcac64b2608452589c9a09984251c01c

Here is the message I got yesterday:

drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3833:1: error: the frame size of 2720 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
 3833 | } // ModeSupportAndSystemConfigurationFull
      | ^

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-21  8:15   ` Stephen Rothwell
@ 2022-06-21 15:02     ` Alex Deucher
  2022-06-21 22:07       ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2022-06-21 15:02 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

On Tue, Jun 21, 2022 at 4:15 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Wed, 15 Jun 2022 15:00:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Fri, 3 Jun 2022 14:43:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the amdgpu tree, today's linux-next build (powerpc
> > > allyesconfig) failed like this:
> > >
> > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> > > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3835:1: error: the frame size of 2752 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> > >  3835 | } // ModeSupportAndSystemConfigurationFull
> > >       | ^
> > > cc1: all warnings being treated as errors
> >
> > I am still getting the above failure.
>
> I am still getting the above failure ... it has now been 19 days :-(

Is it still the same error or something else?  I thought this was
fixed in this patch:
https://gitlab.freedesktop.org/agd5f/linux/-/commit/d6aa8424bcac64b2608452589c9a09984251c01c

Alex

>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-15  5:00 ` Stephen Rothwell
@ 2022-06-21  8:15   ` Stephen Rothwell
  2022-06-21 15:02     ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-21  8:15 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi all,

On Wed, 15 Jun 2022 15:00:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 3 Jun 2022 14:43:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> > drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3835:1: error: the frame size of 2752 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> >  3835 | } // ModeSupportAndSystemConfigurationFull
> >       | ^
> > cc1: all warnings being treated as errors  
> 
> I am still getting the above failure.

I am still getting the above failure ... it has now been 19 days :-(

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-15  4:37 Stephen Rothwell
@ 2022-06-15 18:17 ` Alex Deucher
  0 siblings, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2022-06-15 18:17 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Harry Wentland, Linux Kernel Mailing List, Linux Next Mailing List

On Wed, Jun 15, 2022 at 12:38 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:1835:13: error: 'remove_hpo_dp_link_enc_from_ctx' defined but not used [-Werror=unused-function]
>  1835 | static void remove_hpo_dp_link_enc_from_ctx(struct resource_context *res_ctx,
>       |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
>   4e1db0119c64 ("Revert "drm/amdgpu/display: Protect some functions with CONFIG_DRM_AMD_DC_DCN"")
>
> That function is only used when CONFIG_DRM_AMD_DC_DCN is set.

Sorry, I had the fix in my tree, but forgot to push it.  It's there now.

Alex

>
> I have reverted that commit for today.
>
> Could you please add an x86_64 allmodconfig build to your CI?
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-03  4:43 Stephen Rothwell
  2022-06-09  3:14 ` Stephen Rothwell
@ 2022-06-15  5:00 ` Stephen Rothwell
  2022-06-21  8:15   ` Stephen Rothwell
  1 sibling, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-15  5:00 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi all,

On Fri, 3 Jun 2022 14:43:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3835:1: error: the frame size of 2752 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>  3835 | } // ModeSupportAndSystemConfigurationFull
>       | ^
> cc1: all warnings being treated as errors

I am still getting the above failure.

> gcc: error: unrecognized command-line option '-msse'
> gcc: error: unrecognized command-line option '-msse2'
> make[5]: *** [scripts/Makefile.build:251: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn32/dcn32_resource.o] Error 1
> gcc: error: unrecognized command-line option '-msse'
> gcc: error: unrecognized command-line option '-msse2'

These are fixed.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-06-15  4:37 Stephen Rothwell
  2022-06-15 18:17 ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-15  4:37 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Harry Wentland, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:1835:13: error: 'remove_hpo_dp_link_enc_from_ctx' defined but not used [-Werror=unused-function]
 1835 | static void remove_hpo_dp_link_enc_from_ctx(struct resource_context *res_ctx, 
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  4e1db0119c64 ("Revert "drm/amdgpu/display: Protect some functions with CONFIG_DRM_AMD_DC_DCN"")

That function is only used when CONFIG_DRM_AMD_DC_DCN is set.

I have reverted that commit for today.

Could you please add an x86_64 allmodconfig build to your CI?

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-06-14  4:51 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-14  4:51 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the amdgpu 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 'dm_plane_format_mod_supported':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4941:13: error: unused variable 'i' [-Werror=unused-variable]
 4941 |         int i;
      |             ^
cc1: all warnings being treated as errors

Caused by commit

  d2d5adc87f69 ("drm/amd/display: ignore modifiers when checking for format support")

I have revertd that commit for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-06-03  4:43 Stephen Rothwell
@ 2022-06-09  3:14 ` Stephen Rothwell
  2022-06-15  5:00 ` Stephen Rothwell
  1 sibling, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-09  3:14 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi all,

On Fri, 3 Jun 2022 14:43:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3835:1: error: the frame size of 2752 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
>  3835 | } // ModeSupportAndSystemConfigurationFull
>       | ^
> cc1: all warnings being treated as errors
> make[5]: *** [scripts/Makefile.build:250: drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.o] Error 1
> gcc: error: unrecognized command-line option '-msse'
> gcc: error: unrecognized command-line option '-msse2'
> make[5]: *** [scripts/Makefile.build:251: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn32/dcn32_resource.o] Error 1
> gcc: error: unrecognized command-line option '-msse'
> gcc: error: unrecognized command-line option '-msse2'
> 
> Caused (probably) by commits
> 
>   5cbb369e32bd ("drm/amd/display: DML changes for DCN32/321")
>   b5dbe04a9c8c ("drm/amd/display: add CLKMGR changes for DCN32/321")
>   4f185390597e ("drm/amd/display: add DCN32/321 specific files for Display Core")
> 
> I have used the amdgpu tree from next-20220601 again for today.

I am still getting these failures.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-06-03  4:43 Stephen Rothwell
  2022-06-09  3:14 ` Stephen Rothwell
  2022-06-15  5:00 ` Stephen Rothwell
  0 siblings, 2 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-03  4:43 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3835:1: error: the frame size of 2752 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
 3835 | } // ModeSupportAndSystemConfigurationFull
      | ^
cc1: all warnings being treated as errors
make[5]: *** [scripts/Makefile.build:250: drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.o] Error 1
gcc: error: unrecognized command-line option '-msse'
gcc: error: unrecognized command-line option '-msse2'
make[5]: *** [scripts/Makefile.build:251: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn32/dcn32_resource.o] Error 1
gcc: error: unrecognized command-line option '-msse'
gcc: error: unrecognized command-line option '-msse2'

Caused (probably) by commits

  5cbb369e32bd ("drm/amd/display: DML changes for DCN32/321")
  b5dbe04a9c8c ("drm/amd/display: add CLKMGR changes for DCN32/321")
  4f185390597e ("drm/amd/display: add DCN32/321 specific files for Display Core")

I have used the amdgpu tree from next-20220601 again for today.

Is this new stuff really for the current merge window?  If so, it has
arrived pretty late.  If not then it should not have been in linux-next
at all ...
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-06-02  0:30 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-06-02  0:30 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Aurabindo Pillai, Dave Airlie, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:1835:13: error: 'remove_hpo_dp_link_enc_from_ctx' defined but not used [-Werror=unused-function]
 1835 | static void remove_hpo_dp_link_enc_from_ctx(struct resource_context *res_ctx,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  9b0e0d433f74 ("drm/amd/display: Add dependant changes for DCN32/321")

I have used the amdgpu tree from next-20220601 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-05-06  1:06 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-05-06  1:06 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Kenneth Feng, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c: In function 'smu_v13_0_7_get_power_profile_mode':
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1381:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1381 |         PRINT_DPM_MONITOR(Fclk_BoosterFreq);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1380:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1380 |         PRINT_DPM_MONITOR(Fclk_MinActiveFreq);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1379:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1379 |         PRINT_DPM_MONITOR(Fclk_BoosterFreqType);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1378:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1378 |         PRINT_DPM_MONITOR(Fclk_MinActiveFreqType);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1377:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1377 |         PRINT_DPM_MONITOR(Fclk_FPS);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1376:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1376 |         PRINT_DPM_MONITOR(Fclk_IdleHystLimit);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1375:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1375 |         PRINT_DPM_MONITOR(Fclk_ActiveHystLimit);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1374:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1374 |         PRINT_DPM_MONITOR(Gfx_BoosterFreq);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1373:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1373 |         PRINT_DPM_MONITOR(Gfx_MinActiveFreq);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1372:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1372 |         PRINT_DPM_MONITOR(Gfx_BoosterFreqType);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1371:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1371 |         PRINT_DPM_MONITOR(Gfx_MinActiveFreqType);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1370:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1370 |         PRINT_DPM_MONITOR(Gfx_FPS);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1369:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1369 |         PRINT_DPM_MONITOR(Gfx_IdleHystLimit);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1364:84: error: array subscript 8 is above array bounds of 'DpmActivityMonitorCoeffIntExternal_t[8]' [-Werror=array-bounds]
 1364 |                 size += sysfs_emit_at(buf, size, "%-16d", activity_monitor_external[i].DpmActivityMonitorCoeffInt.field);               \
      |                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~^~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1368:9: note: in expansion of macro 'PRINT_DPM_MONITOR'
 1368 |         PRINT_DPM_MONITOR(Gfx_ActiveHystLimit);
      |         ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_7_ppt.c:1328:46: note: while referencing 'activity_monitor_external'
 1328 |         DpmActivityMonitorCoeffIntExternal_t activity_monitor_external[PP_SMC_POWER_PROFILE_COUNT];
      |                                              ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  878205b8c170 ("drm/amd/pm: enable workload type change on smu_v13_0_7")

I have used the amdgpu tree from next-20220505 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-05-05 18:46   ` Alex Deucher
@ 2022-05-06  1:05     ` Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-05-06  1:05 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Nathan Chancellor, Jack Xiao, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

On Thu, 5 May 2022 14:46:25 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> On Thu, May 5, 2022 at 2:12 PM Nathan Chancellor <nathan@kernel.org> wrote:
> >
> > This fixup makes CONFIG_DRM_AMDGPU unselectable on any architecture that
> > does not have CONFIG_CPU_LITTLE_ENDIAN, such as x86_64. I was rather
> > surprised when my AMD test system did not reach the login screen and
> > there were no error messages in dmesg, only to find that
> > CONFIG_DRM_AMDGPU had disappeared from my build.
> >
> > If this is not fixed by the time you do next-20220506, would you
> > consider swapping the logic like so? This should allow all implicitly
> > little endian architectures to work (at least, I tested it with x86_64),
> > while preventing errors for CONFIG_CPU_BIG_ENDIAN configurations.  
> 
> This is fixed.  Will push out a new branch shortly.
> 
> >
> > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> > index 2aaa9ef1168d..a57843733a96 100644
> > --- a/drivers/gpu/drm/Kconfig
> > +++ b/drivers/gpu/drm/Kconfig
> > @@ -244,7 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
> >  config DRM_AMDGPU
> >         tristate "AMD GPU"
> >         depends on DRM && PCI && MMU
> > -       depends on CPU_LITTLE_ENDIAN
> > +       depends on !CPU_BIG_ENDIAN
> >         select FW_LOADER
> >         select DRM_DISPLAY_DP_HELPER
> >         select DRM_DISPLAY_HDMI_HELPER  

Since today's amdgpu tree is broken, I have used the above with
yesterday's tree.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-05-05 18:12 ` Nathan Chancellor
@ 2022-05-05 18:46   ` Alex Deucher
  2022-05-06  1:05     ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2022-05-05 18:46 UTC (permalink / raw)
  To: Nathan Chancellor
  Cc: Stephen Rothwell, Jack Xiao, Linux Kernel Mailing List,
	Linux Next Mailing List

On Thu, May 5, 2022 at 2:12 PM Nathan Chancellor <nathan@kernel.org> wrote:
>
> Hi Stephen,
>
> On Thu, May 05, 2022 at 07:47:17PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
>
> <snip long error message>
>
> >
> > Caused by commit
> >
> >   028c3fb37e70 ("drm/amdgpu/mes11: initiate mes v11 support")
> >
> > This build has __BIG_ENDIAN set.
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 5 May 2022 19:14:25 +1000
> > Subject: [PATCH] mark CONFIG_DRM_AMDGPU as depending on CONFIG_CPU_LITTLE_ENDIAN
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/gpu/drm/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> > index e88c497fa010..2aaa9ef1168d 100644
> > --- a/drivers/gpu/drm/Kconfig
> > +++ b/drivers/gpu/drm/Kconfig
> > @@ -244,6 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
> >  config DRM_AMDGPU
> >       tristate "AMD GPU"
> >       depends on DRM && PCI && MMU
> > +     depends on CPU_LITTLE_ENDIAN
> >       select FW_LOADER
> >       select DRM_DISPLAY_DP_HELPER
> >       select DRM_DISPLAY_HDMI_HELPER
> > --
> > 2.35.1
>
> This fixup makes CONFIG_DRM_AMDGPU unselectable on any architecture that
> does not have CONFIG_CPU_LITTLE_ENDIAN, such as x86_64. I was rather
> surprised when my AMD test system did not reach the login screen and
> there were no error messages in dmesg, only to find that
> CONFIG_DRM_AMDGPU had disappeared from my build.
>
> If this is not fixed by the time you do next-20220506, would you
> consider swapping the logic like so? This should allow all implicitly
> little endian architectures to work (at least, I tested it with x86_64),
> while preventing errors for CONFIG_CPU_BIG_ENDIAN configurations.

This is fixed.  Will push out a new branch shortly.

Alex

>
> Cheers,
> Nathan
>
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index 2aaa9ef1168d..a57843733a96 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -244,7 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
>  config DRM_AMDGPU
>         tristate "AMD GPU"
>         depends on DRM && PCI && MMU
> -       depends on CPU_LITTLE_ENDIAN
> +       depends on !CPU_BIG_ENDIAN
>         select FW_LOADER
>         select DRM_DISPLAY_DP_HELPER
>         select DRM_DISPLAY_HDMI_HELPER

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-05-05  9:47 Stephen Rothwell
@ 2022-05-05 18:12 ` Nathan Chancellor
  2022-05-05 18:46   ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Nathan Chancellor @ 2022-05-05 18:12 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Jack Xiao, Linux Kernel Mailing List,
	Linux Next Mailing List

Hi Stephen,

On Thu, May 05, 2022 at 07:47:17PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 

<snip long error message>

> 
> Caused by commit
> 
>   028c3fb37e70 ("drm/amdgpu/mes11: initiate mes v11 support")
> 
> This build has __BIG_ENDIAN set.
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 5 May 2022 19:14:25 +1000
> Subject: [PATCH] mark CONFIG_DRM_AMDGPU as depending on CONFIG_CPU_LITTLE_ENDIAN
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index e88c497fa010..2aaa9ef1168d 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -244,6 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
>  config DRM_AMDGPU
>  	tristate "AMD GPU"
>  	depends on DRM && PCI && MMU
> +	depends on CPU_LITTLE_ENDIAN
>  	select FW_LOADER
>  	select DRM_DISPLAY_DP_HELPER
>  	select DRM_DISPLAY_HDMI_HELPER
> -- 
> 2.35.1

This fixup makes CONFIG_DRM_AMDGPU unselectable on any architecture that
does not have CONFIG_CPU_LITTLE_ENDIAN, such as x86_64. I was rather
surprised when my AMD test system did not reach the login screen and
there were no error messages in dmesg, only to find that
CONFIG_DRM_AMDGPU had disappeared from my build.

If this is not fixed by the time you do next-20220506, would you
consider swapping the logic like so? This should allow all implicitly
little endian architectures to work (at least, I tested it with x86_64),
while preventing errors for CONFIG_CPU_BIG_ENDIAN configurations.

Cheers,
Nathan

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 2aaa9ef1168d..a57843733a96 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -244,7 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
 config DRM_AMDGPU
 	tristate "AMD GPU"
 	depends on DRM && PCI && MMU
-	depends on CPU_LITTLE_ENDIAN
+	depends on !CPU_BIG_ENDIAN
 	select FW_LOADER
 	select DRM_DISPLAY_DP_HELPER
 	select DRM_DISPLAY_HDMI_HELPER

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-05-05  9:47 Stephen Rothwell
  2022-05-05 18:12 ` Nathan Chancellor
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-05-05  9:47 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Jack Xiao, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

In file included from drivers/gpu/drm/amd/amdgpu/mes_v11_0.c:26:
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c: In function 'mes_v11_0_mqd_init':
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c:697:34: error: 'CP_HQD_PQ_CONTROL__ENDIAN_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_HQD_PQ_CONTROL__PRIV_STATE_MASK'?
  697 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |                                  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1177:36: note: in definition of macro 'REG_FIELD_MASK'
 1177 | #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
      |                                    ^~~
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c:697:15: note: in expansion of macro 'REG_SET_FIELD'
  697 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |               ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c:697:34: note: each undeclared identifier is reported only once for each function it appears in
  697 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |                                  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1177:36: note: in definition of macro 'REG_FIELD_MASK'
 1177 | #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
      |                                    ^~~
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c:697:15: note: in expansion of macro 'REG_SET_FIELD'
  697 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |               ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c:697:34: error: 'CP_HQD_PQ_CONTROL__ENDIAN_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_HQD_PQ_CONTROL__PRIV_STATE__SHIFT'?
  697 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |                                  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1176:37: note: in definition of macro 'REG_FIELD_SHIFT'
 1176 | #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
      |                                     ^~~
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c:697:15: note: in expansion of macro 'REG_SET_FIELD'
  697 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |               ^~~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:28:
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c: In function 'gfx_v11_0_cp_gfx_resume':
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:3413:34: error: 'CP_RB0_CNTL__BUF_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_RB0_CNTL__TMZ_STATE_MASK'?
 3413 |         tmp = REG_SET_FIELD(tmp, CP_RB0_CNTL, BUF_SWAP, 1);
      |                                  ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1177:36: note: in definition of macro 'REG_FIELD_MASK'
 1177 | #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
      |                                    ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:3413:15: note: in expansion of macro 'REG_SET_FIELD'
 3413 |         tmp = REG_SET_FIELD(tmp, CP_RB0_CNTL, BUF_SWAP, 1);
      |               ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:3413:34: note: each undeclared identifier is reported only once for each function it appears in
 3413 |         tmp = REG_SET_FIELD(tmp, CP_RB0_CNTL, BUF_SWAP, 1);
      |                                  ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1177:36: note: in definition of macro 'REG_FIELD_MASK'
 1177 | #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
      |                                    ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:3413:15: note: in expansion of macro 'REG_SET_FIELD'
 3413 |         tmp = REG_SET_FIELD(tmp, CP_RB0_CNTL, BUF_SWAP, 1);
      |               ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:3413:34: error: 'CP_RB0_CNTL__BUF_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_RB0_CNTL__TMZ_STATE__SHIFT'?
 3413 |         tmp = REG_SET_FIELD(tmp, CP_RB0_CNTL, BUF_SWAP, 1);
      |                                  ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1176:37: note: in definition of macro 'REG_FIELD_SHIFT'
 1176 | #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
      |                                     ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:3413:15: note: in expansion of macro 'REG_SET_FIELD'
 3413 |         tmp = REG_SET_FIELD(tmp, CP_RB0_CNTL, BUF_SWAP, 1);
      |               ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c: In function 'gfx_v11_0_compute_mqd_init':
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:4063:34: error: 'CP_HQD_PQ_CONTROL__ENDIAN_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_HQD_PQ_CONTROL__PRIV_STATE_MASK'?
 4063 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |                                  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1177:36: note: in definition of macro 'REG_FIELD_MASK'
 1177 | #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
      |                                    ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:4063:15: note: in expansion of macro 'REG_SET_FIELD'
 4063 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |               ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:4063:34: error: 'CP_HQD_PQ_CONTROL__ENDIAN_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_HQD_PQ_CONTROL__PRIV_STATE__SHIFT'?
 4063 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |                                  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1176:37: note: in definition of macro 'REG_FIELD_SHIFT'
 1176 | #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
      |                                     ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:4063:15: note: in expansion of macro 'REG_SET_FIELD'
 4063 |         tmp = REG_SET_FIELD(tmp, CP_HQD_PQ_CONTROL, ENDIAN_SWAP, 1);
      |               ^~~~~~~~~~~~~

Caused by commit

  028c3fb37e70 ("drm/amdgpu/mes11: initiate mes v11 support")

This build has __BIG_ENDIAN set.

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 May 2022 19:14:25 +1000
Subject: [PATCH] mark CONFIG_DRM_AMDGPU as depending on CONFIG_CPU_LITTLE_ENDIAN

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

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index e88c497fa010..2aaa9ef1168d 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -244,6 +244,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
 config DRM_AMDGPU
 	tristate "AMD GPU"
 	depends on DRM && PCI && MMU
+	depends on CPU_LITTLE_ENDIAN
 	select FW_LOADER
 	select DRM_DISPLAY_DP_HELPER
 	select DRM_DISPLAY_HDMI_HELPER
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-04-14 14:27       ` Alex Deucher
@ 2022-04-14 14:31         ` Rodrigo Siqueira Jordao
  0 siblings, 0 replies; 109+ messages in thread
From: Rodrigo Siqueira Jordao @ 2022-04-14 14:31 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Stephen Rothwell, Zhang, Dingchen (David),
	Kotarac, Pavle, Chung, ChiaHsuan (Tom),
	Linux Kernel Mailing List, Linux Next Mailing List, Siqueira,
	Rodrigo



On 2022-04-14 10:27, Alex Deucher wrote:
> On Thu, Apr 14, 2022 at 10:23 AM Rodrigo Siqueira Jordao
> <rjordrigo@amd.com> wrote:
>>
>> Hi Alex,
>>
>> Do we need to apply David's patch [1] to drm-misc-next? If so, I can
>> merge it there. Also, I noticed that drm-misc-next changed the dp header
>> path; in that way, I had to change the original patch a little bit.
>>
>> 1. https://patchwork.freedesktop.org/patch/480331/?series=102035&rev=1>>>
> 
> Ideally it would have gone through drm-misc, but since we are the only
> ones using it at this point, I think it's ok to take through my tree.
> I'll make a note about the path change when I send the PR.

Ok, Next time I'll try to push this type of patch directly to drm-misc-next.

Thanks
Siqueira

> Alex
> 
>> Best Regards,
>> Siqueira
>>
>> On 2022-04-14 10:08, Zhang, Dingchen (David) wrote:
>>> [AMD Official Use Only]
>>>
>>>
>>> Thanks for clarifying, Alex.
>>> ------------------------------------------------------------------------
>>> *From:* Alex Deucher <alexdeucher@gmail.com>
>>> *Sent:* Wednesday, April 13, 2022 10:18 AM
>>> *To:* Zhang, Dingchen (David) <Dingchen.Zhang@amd.com>
>>> *Cc:* Stephen Rothwell <sfr@canb.auug.org.au>; Kotarac, Pavle
>>> <Pavle.Kotarac@amd.com>; Chung, ChiaHsuan (Tom)
>>> <ChiaHsuan.Chung@amd.com>; Linux Kernel Mailing List
>>> <linux-kernel@vger.kernel.org>; Linux Next Mailing List
>>> <linux-next@vger.kernel.org>
>>> *Subject:* Re: linux-next: build failure after merge of the amdgpu tree
>>> The patch should be there now.
>>>
>>> Alex
>>>
>>> On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
>>> <Dingchen.Zhang@amd.com> wrote:
>>>>
>>>> [AMD Official Use Only]
>>>>
>>>>
>>>> hi Stephen,
>>>>
>>>> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
>>>>
>>>> ~~~~
>>>> eb2bb029bacf David Zhang         12 days ago    drm: add PSR2 support and capability definition as per eDP 1.5
>>>> ~~~~~
>>>>
>>>> Thanks
>>>> David
>>>> ________________________________ From: Stephen Rothwell
>>>> Sent: Tuesday, April 12, 2022 10:32 PM
>>>> To: Alex Deucher
>>>> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
>>>> Subject: linux-next: build failure after merge of the amdgpu tree
>>>>
>>>> Hi all,
>>>>
>>>> After merging the amdgpu tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
>>>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
>>>>    798 |                 if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
>>>>        |                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>        |                                                             DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
>>>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
>>>>
>>>> Caused by commit
>>>>
>>>>    901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
>>>>
>>>> Please start including an x86_64 allmodconfig build in your local testing.
>>>>
>>>> I have used the amdgpu tree from next-20220412 for today.
>>>>
>>>> --
>>>> Cheers,
>>>> Stephen Rothwell
>>


^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-04-14 14:23     ` Rodrigo Siqueira Jordao
@ 2022-04-14 14:27       ` Alex Deucher
  2022-04-14 14:31         ` Rodrigo Siqueira Jordao
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2022-04-14 14:27 UTC (permalink / raw)
  To: Rodrigo Siqueira Jordao
  Cc: Stephen Rothwell, Zhang, Dingchen (David),
	Kotarac, Pavle, Chung, ChiaHsuan (Tom),
	Linux Kernel Mailing List, Linux Next Mailing List, Siqueira,
	Rodrigo

On Thu, Apr 14, 2022 at 10:23 AM Rodrigo Siqueira Jordao
<rjordrigo@amd.com> wrote:
>
> Hi Alex,
>
> Do we need to apply David's patch [1] to drm-misc-next? If so, I can
> merge it there. Also, I noticed that drm-misc-next changed the dp header
> path; in that way, I had to change the original patch a little bit.
>
> 1. https://patchwork.freedesktop.org/patch/480331/?series=102035&rev=1
>

Ideally it would have gone through drm-misc, but since we are the only
ones using it at this point, I think it's ok to take through my tree.
I'll make a note about the path change when I send the PR.

Alex

> Best Regards,
> Siqueira
>
> On 2022-04-14 10:08, Zhang, Dingchen (David) wrote:
> > [AMD Official Use Only]
> >
> >
> > Thanks for clarifying, Alex.
> > ------------------------------------------------------------------------
> > *From:* Alex Deucher <alexdeucher@gmail.com>
> > *Sent:* Wednesday, April 13, 2022 10:18 AM
> > *To:* Zhang, Dingchen (David) <Dingchen.Zhang@amd.com>
> > *Cc:* Stephen Rothwell <sfr@canb.auug.org.au>; Kotarac, Pavle
> > <Pavle.Kotarac@amd.com>; Chung, ChiaHsuan (Tom)
> > <ChiaHsuan.Chung@amd.com>; Linux Kernel Mailing List
> > <linux-kernel@vger.kernel.org>; Linux Next Mailing List
> > <linux-next@vger.kernel.org>
> > *Subject:* Re: linux-next: build failure after merge of the amdgpu tree
> > The patch should be there now.
> >
> > Alex
> >
> > On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
> > <Dingchen.Zhang@amd.com> wrote:
> >>
> >> [AMD Official Use Only]
> >>
> >>
> >> hi Stephen,
> >>
> >> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
> >>
> >> ~~~~
> >> eb2bb029bacf David Zhang         12 days ago    drm: add PSR2 support and capability definition as per eDP 1.5
> >> ~~~~~
> >>
> >> Thanks
> >> David
> >> ________________________________ From: Stephen Rothwell
> >> Sent: Tuesday, April 12, 2022 10:32 PM
> >> To: Alex Deucher
> >> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
> >> Subject: linux-next: build failure after merge of the amdgpu tree
> >>
> >> Hi all,
> >>
> >> After merging the amdgpu tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >>
> >> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
> >> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
> >>   798 |                 if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
> >>       |                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >>       |                                                             DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
> >> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
> >>
> >> Caused by commit
> >>
> >>   901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
> >>
> >> Please start including an x86_64 allmodconfig build in your local testing.
> >>
> >> I have used the amdgpu tree from next-20220412 for today.
> >>
> >> --
> >> Cheers,
> >> Stephen Rothwell
>

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
       [not found]   ` <BN9PR12MB5145D81F9978B656E9BB67C78DEF9@BN9PR12MB5145.namprd12.prod.outlook.com>
@ 2022-04-14 14:23     ` Rodrigo Siqueira Jordao
  2022-04-14 14:27       ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Rodrigo Siqueira Jordao @ 2022-04-14 14:23 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Stephen Rothwell, Zhang, Dingchen (David),
	Kotarac, Pavle, Chung, ChiaHsuan (Tom),
	Linux Kernel Mailing List, Linux Next Mailing List, Siqueira,
	Rodrigo

Hi Alex,

Do we need to apply David's patch [1] to drm-misc-next? If so, I can 
merge it there. Also, I noticed that drm-misc-next changed the dp header 
path; in that way, I had to change the original patch a little bit.

1. https://patchwork.freedesktop.org/patch/480331/?series=102035&rev=1

Best Regards,
Siqueira

On 2022-04-14 10:08, Zhang, Dingchen (David) wrote:
> [AMD Official Use Only]
> 
> 
> Thanks for clarifying, Alex.
> ------------------------------------------------------------------------
> *From:* Alex Deucher <alexdeucher@gmail.com>
> *Sent:* Wednesday, April 13, 2022 10:18 AM
> *To:* Zhang, Dingchen (David) <Dingchen.Zhang@amd.com>
> *Cc:* Stephen Rothwell <sfr@canb.auug.org.au>; Kotarac, Pavle 
> <Pavle.Kotarac@amd.com>; Chung, ChiaHsuan (Tom) 
> <ChiaHsuan.Chung@amd.com>; Linux Kernel Mailing List 
> <linux-kernel@vger.kernel.org>; Linux Next Mailing List 
> <linux-next@vger.kernel.org>
> *Subject:* Re: linux-next: build failure after merge of the amdgpu tree
> The patch should be there now.
> 
> Alex
> 
> On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
> <Dingchen.Zhang@amd.com> wrote:
>>
>> [AMD Official Use Only]
>>
>>
>> hi Stephen,
>>
>> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
>>
>> ~~~~
>> eb2bb029bacf David Zhang         12 days ago    drm: add PSR2 support and capability definition as per eDP 1.5
>> ~~~~~
>>
>> Thanks
>> David
>> ________________________________ From: Stephen Rothwell
>> Sent: Tuesday, April 12, 2022 10:32 PM
>> To: Alex Deucher
>> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
>> Subject: linux-next: build failure after merge of the amdgpu tree
>>
>> Hi all,
>>
>> After merging the amdgpu tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
>>   798 |                 if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
>>       |                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>       |                                                             DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
>> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
>>
>> Caused by commit
>>
>>   901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
>>
>> Please start including an x86_64 allmodconfig build in your local testing.
>>
>> I have used the amdgpu tree from next-20220412 for today.
>>
>> --
>> Cheers,
>> Stephen Rothwell


^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
       [not found] <BN9PR12MB5145ECB75120FF9AC1AA4CFB8DEC9@BN9PR12MB5145.namprd12.prod.outlook.com>
@ 2022-04-13 14:18 ` Alex Deucher
       [not found]   ` <BN9PR12MB5145D81F9978B656E9BB67C78DEF9@BN9PR12MB5145.namprd12.prod.outlook.com>
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2022-04-13 14:18 UTC (permalink / raw)
  To: Zhang, Dingchen (David)
  Cc: Stephen Rothwell, Kotarac, Pavle, Chung, ChiaHsuan (Tom),
	Linux Kernel Mailing List, Linux Next Mailing List

The patch should be there now.

Alex

On Wed, Apr 13, 2022 at 10:09 AM Zhang, Dingchen (David)
<Dingchen.Zhang@amd.com> wrote:
>
> [AMD Official Use Only]
>
>
> hi Stephen,
>
> Could you please check if below patch (which has been upstreamed) is in your Linux code base?
>
> ~~~~
> eb2bb029bacf David Zhang         12 days ago    drm: add PSR2 support and capability definition as per eDP 1.5
> ~~~~~
>
> Thanks
> David
> ________________________________ From: Stephen Rothwell
> Sent: Tuesday, April 12, 2022 10:32 PM
> To: Alex Deucher
> Cc: Zhang, Dingchen (David); Kotarac, Pavle; Chung, ChiaHsuan (Tom); Linux Kernel Mailing List; Linux Next Mailing List
> Subject: linux-next: build failure after merge of the amdgpu tree
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
>   798 |                 if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
>       |                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |                                                             DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
> drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
>   901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")
>
> Please start including an x86_64 allmodconfig build in your local testing.
>
> I have used the amdgpu tree from next-20220412 for today.
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-04-13  2:32 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-04-13  2:32 UTC (permalink / raw)
  To: Alex Deucher
  Cc: David Zhang, Pavle Kotarac, Tom Chung, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c: In function 'is_psr_su_specific_panel':
drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: error: 'DP_PSR2_WITH_Y_COORD_ET_SUPPORTED' undeclared (first use in this function); did you mean 'DP_PSR2_WITH_Y_COORD_IS_SUPPORTED'?
  798 |                 if (link->dpcd_caps.psr_info.psr_version >= DP_PSR2_WITH_Y_COORD_ET_SUPPORTED)
      |                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                                                             DP_PSR2_WITH_Y_COORD_IS_SUPPORTED
drivers/gpu/drm/amd/amdgpu/../display/modules/power/power_helpers.c:798:61: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  901029aa0017 ("drm/amd/display: implement shared PSR-SU sink validation helper")

Please start including an x86_64 allmodconfig build in your local testing.

I have used the amdgpu tree from next-20220412 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-04-08  4:46 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-04-08  4:46 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Yongqiang Sun, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c:28:10: fatal error: asm/hypervisor.h: No such file or directory
   28 | #include <asm/hypervisor.h>
      |          ^~~~~~~~~~~~~~~~~~

Caused by commit

  49aa98ca30cd ("drm/amd/amdgpu: Only reserve vram for firmware with vega9 MS_HYPERV host.")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-03-07 13:04 ` Mark Brown
@ 2022-03-08 11:15   ` Noralf Trønnes
  0 siblings, 0 replies; 109+ messages in thread
From: Noralf Trønnes @ 2022-03-08 11:15 UTC (permalink / raw)
  To: Mark Brown, Stephen Rothwell, Maxime Ripard, Maarten Lankhorst,
	Thomas Zimmermann, Alex Deucher
  Cc: Uwe Kleine-König, Linux Kernel Mailing List,
	Linux Next Mailing List, DRI Development

Hi drm-misc maintainers,

I don't know who has act on this but the driver came through
drm-misc-next so it's most likely not amd.

The initial post can be found here:
https://lore.kernel.org/linux-next/YiYC2fQgf7d%2FQPSM@sirena.org.uk/T/

Noralf.

Den 07.03.2022 14.04, skrev Mark Brown:
> On Mon, Mar 07, 2022 at 11:13:42AM +1100, Stephen Rothwell wrote:
> 
>> Caused by commit
>>
>>   0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")
>>
>> interacting with commit
>>
>>   a0386bba7093 ("spi: make remove callback a void function")
>>
>> from the spi trees.
> 
> The amdgpu tree can pull this tag and apply Stephen's fix as part of
> that:
> 
> The following changes since commit 26291c54e111ff6ba87a164d85d4a4e134b7315c:
> 
>   Linux 5.17-rc2 (2022-01-30 15:37:07 +0200)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-remove-void
> 
> for you to fetch changes up to a0386bba70934d42f586eaf68b21d5eeaffa7bd0:
> 
>   spi: make remove callback a void function (2022-02-09 13:00:45 +0000)
> 
> ----------------------------------------------------------------
> spi: Make remove() return void
> 
> This series from Uwe Kleine-König converts the spi remove function to
> return void since there is nothing useful that we can do with a failure
> and it as more buses are converted it'll enable further work on the
> driver core.
> 
> ----------------------------------------------------------------
> Uwe Kleine-König (5):
>       staging: fbtft: Fix error path in fbtft_driver_module_init()
>       staging: fbtft: Deduplicate driver registration macros
>       tpm: st33zp24: Make st33zp24_remove() a void function
>       platform/chrome: cros_ec: Make cros_ec_unregister() return void
>       spi: make remove callback a void function
> 
>  drivers/bus/moxtet.c                               |  4 +-
>  drivers/char/tpm/st33zp24/i2c.c                    |  5 +-
>  drivers/char/tpm/st33zp24/spi.c                    |  9 +-
>  drivers/char/tpm/st33zp24/st33zp24.c               |  3 +-
>  drivers/char/tpm/st33zp24/st33zp24.h               |  2 +-
>  drivers/char/tpm/tpm_tis_spi_main.c                |  3 +-
>  drivers/clk/clk-lmk04832.c                         |  4 +-
>  drivers/gpio/gpio-74x164.c                         |  4 +-
>  drivers/gpio/gpio-max3191x.c                       |  4 +-
>  drivers/gpio/gpio-max7301.c                        |  4 +-
>  drivers/gpio/gpio-mc33880.c                        |  4 +-
>  drivers/gpio/gpio-pisosr.c                         |  4 +-
>  drivers/gpu/drm/panel/panel-abt-y030xx067a.c       |  4 +-
>  drivers/gpu/drm/panel/panel-ilitek-ili9322.c       |  4 +-
>  drivers/gpu/drm/panel/panel-ilitek-ili9341.c       |  3 +-
>  drivers/gpu/drm/panel/panel-innolux-ej030na.c      |  4 +-
>  drivers/gpu/drm/panel/panel-lg-lb035q02.c          |  4 +-
>  drivers/gpu/drm/panel/panel-lg-lg4573.c            |  4 +-
>  drivers/gpu/drm/panel/panel-nec-nl8048hl11.c       |  4 +-
>  drivers/gpu/drm/panel/panel-novatek-nt39016.c      |  4 +-
>  drivers/gpu/drm/panel/panel-samsung-db7430.c       |  3 +-
>  drivers/gpu/drm/panel/panel-samsung-ld9040.c       |  4 +-
>  drivers/gpu/drm/panel/panel-samsung-s6d27a1.c      |  3 +-
>  drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c  |  3 +-
>  drivers/gpu/drm/panel/panel-sitronix-st7789v.c     |  4 +-
>  drivers/gpu/drm/panel/panel-sony-acx565akm.c       |  4 +-
>  drivers/gpu/drm/panel/panel-tpo-td028ttec1.c       |  4 +-
>  drivers/gpu/drm/panel/panel-tpo-td043mtea1.c       |  4 +-
>  drivers/gpu/drm/panel/panel-tpo-tpg110.c           |  3 +-
>  drivers/gpu/drm/panel/panel-widechips-ws2401.c     |  3 +-
>  drivers/gpu/drm/tiny/hx8357d.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9163.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9225.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9341.c                     |  4 +-
>  drivers/gpu/drm/tiny/ili9486.c                     |  4 +-
>  drivers/gpu/drm/tiny/mi0283qt.c                    |  4 +-
>  drivers/gpu/drm/tiny/repaper.c                     |  4 +-
>  drivers/gpu/drm/tiny/st7586.c                      |  4 +-
>  drivers/gpu/drm/tiny/st7735r.c                     |  4 +-
>  drivers/hwmon/adcxx.c                              |  4 +-
>  drivers/hwmon/adt7310.c                            |  3 +-
>  drivers/hwmon/max1111.c                            |  3 +-
>  drivers/hwmon/max31722.c                           |  4 +-
>  drivers/iio/accel/bma400_spi.c                     |  4 +-
>  drivers/iio/accel/bmc150-accel-spi.c               |  4 +-
>  drivers/iio/accel/bmi088-accel-spi.c               |  4 +-
>  drivers/iio/accel/kxsd9-spi.c                      |  4 +-
>  drivers/iio/accel/mma7455_spi.c                    |  4 +-
>  drivers/iio/accel/sca3000.c                        |  4 +-
>  drivers/iio/adc/ad7266.c                           |  4 +-
>  drivers/iio/adc/ltc2496.c                          |  4 +-
>  drivers/iio/adc/mcp320x.c                          |  4 +-
>  drivers/iio/adc/mcp3911.c                          |  4 +-
>  drivers/iio/adc/ti-adc12138.c                      |  4 +-
>  drivers/iio/adc/ti-ads7950.c                       |  4 +-
>  drivers/iio/adc/ti-ads8688.c                       |  4 +-
>  drivers/iio/adc/ti-tlc4541.c                       |  4 +-
>  drivers/iio/amplifiers/ad8366.c                    |  4 +-
>  drivers/iio/common/ssp_sensors/ssp_dev.c           |  4 +-
>  drivers/iio/dac/ad5360.c                           |  4 +-
>  drivers/iio/dac/ad5380.c                           |  4 +-
>  drivers/iio/dac/ad5446.c                           |  4 +-
>  drivers/iio/dac/ad5449.c                           |  4 +-
>  drivers/iio/dac/ad5504.c                           |  4 +-
>  drivers/iio/dac/ad5592r.c                          |  4 +-
>  drivers/iio/dac/ad5624r_spi.c                      |  4 +-
>  drivers/iio/dac/ad5686-spi.c                       |  4 +-
>  drivers/iio/dac/ad5761.c                           |  4 +-
>  drivers/iio/dac/ad5764.c                           |  4 +-
>  drivers/iio/dac/ad5791.c                           |  4 +-
>  drivers/iio/dac/ad8801.c                           |  4 +-
>  drivers/iio/dac/ltc1660.c                          |  4 +-
>  drivers/iio/dac/ltc2632.c                          |  4 +-
>  drivers/iio/dac/mcp4922.c                          |  4 +-
>  drivers/iio/dac/ti-dac082s085.c                    |  4 +-
>  drivers/iio/dac/ti-dac7311.c                       |  3 +-
>  drivers/iio/frequency/adf4350.c                    |  4 +-
>  drivers/iio/gyro/bmg160_spi.c                      |  4 +-
>  drivers/iio/gyro/fxas21002c_spi.c                  |  4 +-
>  drivers/iio/health/afe4403.c                       |  4 +-
>  drivers/iio/magnetometer/bmc150_magn_spi.c         |  4 +-
>  drivers/iio/magnetometer/hmc5843_spi.c             |  4 +-
>  drivers/iio/potentiometer/max5487.c                |  4 +-
>  drivers/iio/pressure/ms5611_spi.c                  |  4 +-
>  drivers/iio/pressure/zpa2326_spi.c                 |  4 +-
>  drivers/input/keyboard/applespi.c                  |  4 +-
>  drivers/input/misc/adxl34x-spi.c                   |  4 +-
>  drivers/input/touchscreen/ads7846.c                |  4 +-
>  drivers/input/touchscreen/cyttsp4_spi.c            |  4 +-
>  drivers/input/touchscreen/tsc2005.c                |  4 +-
>  drivers/leds/leds-cr0014114.c                      |  4 +-
>  drivers/leds/leds-dac124s085.c                     |  4 +-
>  drivers/leds/leds-el15203000.c                     |  4 +-
>  drivers/leds/leds-spi-byte.c                       |  4 +-
>  drivers/media/spi/cxd2880-spi.c                    |  4 +-
>  drivers/media/spi/gs1662.c                         |  4 +-
>  drivers/media/tuners/msi001.c                      |  3 +-
>  drivers/mfd/arizona-spi.c                          |  4 +-
>  drivers/mfd/da9052-spi.c                           |  3 +-
>  drivers/mfd/ezx-pcap.c                             |  4 +-
>  drivers/mfd/madera-spi.c                           |  4 +-
>  drivers/mfd/mc13xxx-spi.c                          |  3 +-
>  drivers/mfd/rsmu_spi.c                             |  4 +-
>  drivers/mfd/stmpe-spi.c                            |  4 +-
>  drivers/mfd/tps65912-spi.c                         |  4 +-
>  drivers/misc/ad525x_dpot-spi.c                     |  3 +-
>  drivers/misc/eeprom/eeprom_93xx46.c                |  4 +-
>  drivers/misc/lattice-ecp3-config.c                 |  4 +-
>  drivers/misc/lis3lv02d/lis3lv02d_spi.c             |  4 +-
>  drivers/mmc/host/mmc_spi.c                         |  3 +-
>  drivers/mtd/devices/mchp23k256.c                   |  4 +-
>  drivers/mtd/devices/mchp48l640.c                   |  4 +-
>  drivers/mtd/devices/mtd_dataflash.c                |  4 +-
>  drivers/mtd/devices/sst25l.c                       |  4 +-
>  drivers/net/can/m_can/tcan4x5x-core.c              |  4 +-
>  drivers/net/can/spi/hi311x.c                       |  4 +-
>  drivers/net/can/spi/mcp251x.c                      |  4 +-
>  drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c     |  4 +-
>  drivers/net/dsa/b53/b53_spi.c                      |  4 +-
>  drivers/net/dsa/microchip/ksz8795_spi.c            |  4 +-
>  drivers/net/dsa/microchip/ksz9477_spi.c            |  4 +-
>  drivers/net/dsa/sja1105/sja1105_main.c             |  6 +-
>  drivers/net/dsa/vitesse-vsc73xx-spi.c              |  6 +-
>  drivers/net/ethernet/asix/ax88796c_main.c          |  4 +-
>  drivers/net/ethernet/micrel/ks8851_spi.c           |  4 +-
>  drivers/net/ethernet/microchip/enc28j60.c          |  4 +-
>  drivers/net/ethernet/microchip/encx24j600.c        |  4 +-
>  drivers/net/ethernet/qualcomm/qca_spi.c            |  4 +-
>  drivers/net/ethernet/vertexcom/mse102x.c           |  4 +-
>  drivers/net/ethernet/wiznet/w5100-spi.c            |  4 +-
>  drivers/net/ieee802154/adf7242.c                   |  4 +-
>  drivers/net/ieee802154/at86rf230.c                 |  4 +-
>  drivers/net/ieee802154/ca8210.c                    |  6 +-
>  drivers/net/ieee802154/cc2520.c                    |  4 +-
>  drivers/net/ieee802154/mcr20a.c                    |  4 +-
>  drivers/net/ieee802154/mrf24j40.c                  |  4 +-
>  drivers/net/phy/spi_ks8995.c                       |  4 +-
>  drivers/net/wan/slic_ds26522.c                     |  3 +-
>  drivers/net/wireless/intersil/p54/p54spi.c         |  4 +-
>  drivers/net/wireless/marvell/libertas/if_spi.c     |  4 +-
>  drivers/net/wireless/microchip/wilc1000/spi.c      |  4 +-
>  drivers/net/wireless/st/cw1200/cw1200_spi.c        |  4 +-
>  drivers/net/wireless/ti/wl1251/spi.c               |  4 +-
>  drivers/net/wireless/ti/wlcore/spi.c               |  4 +-
>  drivers/nfc/nfcmrvl/spi.c                          |  3 +-
>  drivers/nfc/st-nci/spi.c                           |  4 +-
>  drivers/nfc/st95hf/core.c                          |  4 +-
>  drivers/nfc/trf7970a.c                             |  4 +-
>  drivers/platform/chrome/cros_ec.c                  |  4 +-
>  drivers/platform/chrome/cros_ec.h                  |  2 +-
>  drivers/platform/chrome/cros_ec_i2c.c              |  4 +-
>  drivers/platform/chrome/cros_ec_lpc.c              |  4 +-
>  drivers/platform/chrome/cros_ec_spi.c              |  4 +-
>  drivers/platform/olpc/olpc-xo175-ec.c              |  4 +-
>  drivers/rtc/rtc-ds1302.c                           |  3 +-
>  drivers/rtc/rtc-ds1305.c                           |  4 +-
>  drivers/rtc/rtc-ds1343.c                           |  4 +-
>  drivers/spi/spi-mem.c                              |  6 +-
>  drivers/spi/spi-slave-system-control.c             |  3 +-
>  drivers/spi/spi-slave-time.c                       |  3 +-
>  drivers/spi/spi-tle62x0.c                          |  3 +-
>  drivers/spi/spi.c                                  | 11 +--
>  drivers/spi/spidev.c                               |  4 +-
>  drivers/staging/fbtft/fbtft.h                      | 97 +++++++++-------------
>  drivers/staging/pi433/pi433_if.c                   |  4 +-
>  drivers/staging/wfx/bus_spi.c                      |  3 +-
>  drivers/tty/serial/max3100.c                       |  5 +-
>  drivers/tty/serial/max310x.c                       |  3 +-
>  drivers/tty/serial/sc16is7xx.c                     |  4 +-
>  drivers/usb/gadget/udc/max3420_udc.c               |  4 +-
>  drivers/usb/host/max3421-hcd.c                     |  3 +-
>  drivers/video/backlight/ams369fg06.c               |  3 +-
>  drivers/video/backlight/corgi_lcd.c                |  3 +-
>  drivers/video/backlight/ili922x.c                  |  3 +-
>  drivers/video/backlight/l4f00242t03.c              |  3 +-
>  drivers/video/backlight/lms501kf03.c               |  3 +-
>  drivers/video/backlight/ltv350qv.c                 |  3 +-
>  drivers/video/backlight/tdo24m.c                   |  3 +-
>  drivers/video/backlight/tosa_lcd.c                 |  4 +-
>  drivers/video/backlight/vgg2432a4.c                |  4 +-
>  drivers/video/fbdev/omap/lcd_mipid.c               |  4 +-
>  .../omapfb/displays/panel-lgphilips-lb035q02.c     |  4 +-
>  .../omap2/omapfb/displays/panel-nec-nl8048hl11.c   |  4 +-
>  .../omap2/omapfb/displays/panel-sony-acx565akm.c   |  4 +-
>  .../omap2/omapfb/displays/panel-tpo-td028ttec1.c   |  4 +-
>  .../omap2/omapfb/displays/panel-tpo-td043mtea1.c   |  4 +-
>  include/linux/spi/spi.h                            |  2 +-
>  sound/pci/hda/cs35l41_hda_spi.c                    |  4 +-
>  sound/soc/codecs/adau1761-spi.c                    |  3 +-
>  sound/soc/codecs/adau1781-spi.c                    |  3 +-
>  sound/soc/codecs/cs35l41-spi.c                     |  4 +-
>  sound/soc/codecs/pcm3168a-spi.c                    |  4 +-
>  sound/soc/codecs/pcm512x-spi.c                     |  3 +-
>  sound/soc/codecs/tlv320aic32x4-spi.c               |  4 +-
>  sound/soc/codecs/tlv320aic3x-spi.c                 |  4 +-
>  sound/soc/codecs/wm0010.c                          |  4 +-
>  sound/soc/codecs/wm8804-spi.c                      |  3 +-
>  sound/spi/at73c213.c                               |  4 +-
>  198 files changed, 248 insertions(+), 617 deletions(-)

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-03-07  0:13 Stephen Rothwell
  2022-03-07  7:16 ` Uwe Kleine-König
@ 2022-03-07 13:04 ` Mark Brown
  2022-03-08 11:15   ` Noralf Trønnes
  1 sibling, 1 reply; 109+ messages in thread
From: Mark Brown @ 2022-03-07 13:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Uwe Kleine-König, Maxime Ripard,
	Noralf Trønnes, Linux Kernel Mailing List,
	Linux Next Mailing List

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

On Mon, Mar 07, 2022 at 11:13:42AM +1100, Stephen Rothwell wrote:

> Caused by commit
> 
>   0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")
> 
> interacting with commit
> 
>   a0386bba7093 ("spi: make remove callback a void function")
> 
> from the spi trees.

The amdgpu tree can pull this tag and apply Stephen's fix as part of
that:

The following changes since commit 26291c54e111ff6ba87a164d85d4a4e134b7315c:

  Linux 5.17-rc2 (2022-01-30 15:37:07 +0200)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-remove-void

for you to fetch changes up to a0386bba70934d42f586eaf68b21d5eeaffa7bd0:

  spi: make remove callback a void function (2022-02-09 13:00:45 +0000)

----------------------------------------------------------------
spi: Make remove() return void

This series from Uwe Kleine-König converts the spi remove function to
return void since there is nothing useful that we can do with a failure
and it as more buses are converted it'll enable further work on the
driver core.

----------------------------------------------------------------
Uwe Kleine-König (5):
      staging: fbtft: Fix error path in fbtft_driver_module_init()
      staging: fbtft: Deduplicate driver registration macros
      tpm: st33zp24: Make st33zp24_remove() a void function
      platform/chrome: cros_ec: Make cros_ec_unregister() return void
      spi: make remove callback a void function

 drivers/bus/moxtet.c                               |  4 +-
 drivers/char/tpm/st33zp24/i2c.c                    |  5 +-
 drivers/char/tpm/st33zp24/spi.c                    |  9 +-
 drivers/char/tpm/st33zp24/st33zp24.c               |  3 +-
 drivers/char/tpm/st33zp24/st33zp24.h               |  2 +-
 drivers/char/tpm/tpm_tis_spi_main.c                |  3 +-
 drivers/clk/clk-lmk04832.c                         |  4 +-
 drivers/gpio/gpio-74x164.c                         |  4 +-
 drivers/gpio/gpio-max3191x.c                       |  4 +-
 drivers/gpio/gpio-max7301.c                        |  4 +-
 drivers/gpio/gpio-mc33880.c                        |  4 +-
 drivers/gpio/gpio-pisosr.c                         |  4 +-
 drivers/gpu/drm/panel/panel-abt-y030xx067a.c       |  4 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9322.c       |  4 +-
 drivers/gpu/drm/panel/panel-ilitek-ili9341.c       |  3 +-
 drivers/gpu/drm/panel/panel-innolux-ej030na.c      |  4 +-
 drivers/gpu/drm/panel/panel-lg-lb035q02.c          |  4 +-
 drivers/gpu/drm/panel/panel-lg-lg4573.c            |  4 +-
 drivers/gpu/drm/panel/panel-nec-nl8048hl11.c       |  4 +-
 drivers/gpu/drm/panel/panel-novatek-nt39016.c      |  4 +-
 drivers/gpu/drm/panel/panel-samsung-db7430.c       |  3 +-
 drivers/gpu/drm/panel/panel-samsung-ld9040.c       |  4 +-
 drivers/gpu/drm/panel/panel-samsung-s6d27a1.c      |  3 +-
 drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c  |  3 +-
 drivers/gpu/drm/panel/panel-sitronix-st7789v.c     |  4 +-
 drivers/gpu/drm/panel/panel-sony-acx565akm.c       |  4 +-
 drivers/gpu/drm/panel/panel-tpo-td028ttec1.c       |  4 +-
 drivers/gpu/drm/panel/panel-tpo-td043mtea1.c       |  4 +-
 drivers/gpu/drm/panel/panel-tpo-tpg110.c           |  3 +-
 drivers/gpu/drm/panel/panel-widechips-ws2401.c     |  3 +-
 drivers/gpu/drm/tiny/hx8357d.c                     |  4 +-
 drivers/gpu/drm/tiny/ili9163.c                     |  4 +-
 drivers/gpu/drm/tiny/ili9225.c                     |  4 +-
 drivers/gpu/drm/tiny/ili9341.c                     |  4 +-
 drivers/gpu/drm/tiny/ili9486.c                     |  4 +-
 drivers/gpu/drm/tiny/mi0283qt.c                    |  4 +-
 drivers/gpu/drm/tiny/repaper.c                     |  4 +-
 drivers/gpu/drm/tiny/st7586.c                      |  4 +-
 drivers/gpu/drm/tiny/st7735r.c                     |  4 +-
 drivers/hwmon/adcxx.c                              |  4 +-
 drivers/hwmon/adt7310.c                            |  3 +-
 drivers/hwmon/max1111.c                            |  3 +-
 drivers/hwmon/max31722.c                           |  4 +-
 drivers/iio/accel/bma400_spi.c                     |  4 +-
 drivers/iio/accel/bmc150-accel-spi.c               |  4 +-
 drivers/iio/accel/bmi088-accel-spi.c               |  4 +-
 drivers/iio/accel/kxsd9-spi.c                      |  4 +-
 drivers/iio/accel/mma7455_spi.c                    |  4 +-
 drivers/iio/accel/sca3000.c                        |  4 +-
 drivers/iio/adc/ad7266.c                           |  4 +-
 drivers/iio/adc/ltc2496.c                          |  4 +-
 drivers/iio/adc/mcp320x.c                          |  4 +-
 drivers/iio/adc/mcp3911.c                          |  4 +-
 drivers/iio/adc/ti-adc12138.c                      |  4 +-
 drivers/iio/adc/ti-ads7950.c                       |  4 +-
 drivers/iio/adc/ti-ads8688.c                       |  4 +-
 drivers/iio/adc/ti-tlc4541.c                       |  4 +-
 drivers/iio/amplifiers/ad8366.c                    |  4 +-
 drivers/iio/common/ssp_sensors/ssp_dev.c           |  4 +-
 drivers/iio/dac/ad5360.c                           |  4 +-
 drivers/iio/dac/ad5380.c                           |  4 +-
 drivers/iio/dac/ad5446.c                           |  4 +-
 drivers/iio/dac/ad5449.c                           |  4 +-
 drivers/iio/dac/ad5504.c                           |  4 +-
 drivers/iio/dac/ad5592r.c                          |  4 +-
 drivers/iio/dac/ad5624r_spi.c                      |  4 +-
 drivers/iio/dac/ad5686-spi.c                       |  4 +-
 drivers/iio/dac/ad5761.c                           |  4 +-
 drivers/iio/dac/ad5764.c                           |  4 +-
 drivers/iio/dac/ad5791.c                           |  4 +-
 drivers/iio/dac/ad8801.c                           |  4 +-
 drivers/iio/dac/ltc1660.c                          |  4 +-
 drivers/iio/dac/ltc2632.c                          |  4 +-
 drivers/iio/dac/mcp4922.c                          |  4 +-
 drivers/iio/dac/ti-dac082s085.c                    |  4 +-
 drivers/iio/dac/ti-dac7311.c                       |  3 +-
 drivers/iio/frequency/adf4350.c                    |  4 +-
 drivers/iio/gyro/bmg160_spi.c                      |  4 +-
 drivers/iio/gyro/fxas21002c_spi.c                  |  4 +-
 drivers/iio/health/afe4403.c                       |  4 +-
 drivers/iio/magnetometer/bmc150_magn_spi.c         |  4 +-
 drivers/iio/magnetometer/hmc5843_spi.c             |  4 +-
 drivers/iio/potentiometer/max5487.c                |  4 +-
 drivers/iio/pressure/ms5611_spi.c                  |  4 +-
 drivers/iio/pressure/zpa2326_spi.c                 |  4 +-
 drivers/input/keyboard/applespi.c                  |  4 +-
 drivers/input/misc/adxl34x-spi.c                   |  4 +-
 drivers/input/touchscreen/ads7846.c                |  4 +-
 drivers/input/touchscreen/cyttsp4_spi.c            |  4 +-
 drivers/input/touchscreen/tsc2005.c                |  4 +-
 drivers/leds/leds-cr0014114.c                      |  4 +-
 drivers/leds/leds-dac124s085.c                     |  4 +-
 drivers/leds/leds-el15203000.c                     |  4 +-
 drivers/leds/leds-spi-byte.c                       |  4 +-
 drivers/media/spi/cxd2880-spi.c                    |  4 +-
 drivers/media/spi/gs1662.c                         |  4 +-
 drivers/media/tuners/msi001.c                      |  3 +-
 drivers/mfd/arizona-spi.c                          |  4 +-
 drivers/mfd/da9052-spi.c                           |  3 +-
 drivers/mfd/ezx-pcap.c                             |  4 +-
 drivers/mfd/madera-spi.c                           |  4 +-
 drivers/mfd/mc13xxx-spi.c                          |  3 +-
 drivers/mfd/rsmu_spi.c                             |  4 +-
 drivers/mfd/stmpe-spi.c                            |  4 +-
 drivers/mfd/tps65912-spi.c                         |  4 +-
 drivers/misc/ad525x_dpot-spi.c                     |  3 +-
 drivers/misc/eeprom/eeprom_93xx46.c                |  4 +-
 drivers/misc/lattice-ecp3-config.c                 |  4 +-
 drivers/misc/lis3lv02d/lis3lv02d_spi.c             |  4 +-
 drivers/mmc/host/mmc_spi.c                         |  3 +-
 drivers/mtd/devices/mchp23k256.c                   |  4 +-
 drivers/mtd/devices/mchp48l640.c                   |  4 +-
 drivers/mtd/devices/mtd_dataflash.c                |  4 +-
 drivers/mtd/devices/sst25l.c                       |  4 +-
 drivers/net/can/m_can/tcan4x5x-core.c              |  4 +-
 drivers/net/can/spi/hi311x.c                       |  4 +-
 drivers/net/can/spi/mcp251x.c                      |  4 +-
 drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c     |  4 +-
 drivers/net/dsa/b53/b53_spi.c                      |  4 +-
 drivers/net/dsa/microchip/ksz8795_spi.c            |  4 +-
 drivers/net/dsa/microchip/ksz9477_spi.c            |  4 +-
 drivers/net/dsa/sja1105/sja1105_main.c             |  6 +-
 drivers/net/dsa/vitesse-vsc73xx-spi.c              |  6 +-
 drivers/net/ethernet/asix/ax88796c_main.c          |  4 +-
 drivers/net/ethernet/micrel/ks8851_spi.c           |  4 +-
 drivers/net/ethernet/microchip/enc28j60.c          |  4 +-
 drivers/net/ethernet/microchip/encx24j600.c        |  4 +-
 drivers/net/ethernet/qualcomm/qca_spi.c            |  4 +-
 drivers/net/ethernet/vertexcom/mse102x.c           |  4 +-
 drivers/net/ethernet/wiznet/w5100-spi.c            |  4 +-
 drivers/net/ieee802154/adf7242.c                   |  4 +-
 drivers/net/ieee802154/at86rf230.c                 |  4 +-
 drivers/net/ieee802154/ca8210.c                    |  6 +-
 drivers/net/ieee802154/cc2520.c                    |  4 +-
 drivers/net/ieee802154/mcr20a.c                    |  4 +-
 drivers/net/ieee802154/mrf24j40.c                  |  4 +-
 drivers/net/phy/spi_ks8995.c                       |  4 +-
 drivers/net/wan/slic_ds26522.c                     |  3 +-
 drivers/net/wireless/intersil/p54/p54spi.c         |  4 +-
 drivers/net/wireless/marvell/libertas/if_spi.c     |  4 +-
 drivers/net/wireless/microchip/wilc1000/spi.c      |  4 +-
 drivers/net/wireless/st/cw1200/cw1200_spi.c        |  4 +-
 drivers/net/wireless/ti/wl1251/spi.c               |  4 +-
 drivers/net/wireless/ti/wlcore/spi.c               |  4 +-
 drivers/nfc/nfcmrvl/spi.c                          |  3 +-
 drivers/nfc/st-nci/spi.c                           |  4 +-
 drivers/nfc/st95hf/core.c                          |  4 +-
 drivers/nfc/trf7970a.c                             |  4 +-
 drivers/platform/chrome/cros_ec.c                  |  4 +-
 drivers/platform/chrome/cros_ec.h                  |  2 +-
 drivers/platform/chrome/cros_ec_i2c.c              |  4 +-
 drivers/platform/chrome/cros_ec_lpc.c              |  4 +-
 drivers/platform/chrome/cros_ec_spi.c              |  4 +-
 drivers/platform/olpc/olpc-xo175-ec.c              |  4 +-
 drivers/rtc/rtc-ds1302.c                           |  3 +-
 drivers/rtc/rtc-ds1305.c                           |  4 +-
 drivers/rtc/rtc-ds1343.c                           |  4 +-
 drivers/spi/spi-mem.c                              |  6 +-
 drivers/spi/spi-slave-system-control.c             |  3 +-
 drivers/spi/spi-slave-time.c                       |  3 +-
 drivers/spi/spi-tle62x0.c                          |  3 +-
 drivers/spi/spi.c                                  | 11 +--
 drivers/spi/spidev.c                               |  4 +-
 drivers/staging/fbtft/fbtft.h                      | 97 +++++++++-------------
 drivers/staging/pi433/pi433_if.c                   |  4 +-
 drivers/staging/wfx/bus_spi.c                      |  3 +-
 drivers/tty/serial/max3100.c                       |  5 +-
 drivers/tty/serial/max310x.c                       |  3 +-
 drivers/tty/serial/sc16is7xx.c                     |  4 +-
 drivers/usb/gadget/udc/max3420_udc.c               |  4 +-
 drivers/usb/host/max3421-hcd.c                     |  3 +-
 drivers/video/backlight/ams369fg06.c               |  3 +-
 drivers/video/backlight/corgi_lcd.c                |  3 +-
 drivers/video/backlight/ili922x.c                  |  3 +-
 drivers/video/backlight/l4f00242t03.c              |  3 +-
 drivers/video/backlight/lms501kf03.c               |  3 +-
 drivers/video/backlight/ltv350qv.c                 |  3 +-
 drivers/video/backlight/tdo24m.c                   |  3 +-
 drivers/video/backlight/tosa_lcd.c                 |  4 +-
 drivers/video/backlight/vgg2432a4.c                |  4 +-
 drivers/video/fbdev/omap/lcd_mipid.c               |  4 +-
 .../omapfb/displays/panel-lgphilips-lb035q02.c     |  4 +-
 .../omap2/omapfb/displays/panel-nec-nl8048hl11.c   |  4 +-
 .../omap2/omapfb/displays/panel-sony-acx565akm.c   |  4 +-
 .../omap2/omapfb/displays/panel-tpo-td028ttec1.c   |  4 +-
 .../omap2/omapfb/displays/panel-tpo-td043mtea1.c   |  4 +-
 include/linux/spi/spi.h                            |  2 +-
 sound/pci/hda/cs35l41_hda_spi.c                    |  4 +-
 sound/soc/codecs/adau1761-spi.c                    |  3 +-
 sound/soc/codecs/adau1781-spi.c                    |  3 +-
 sound/soc/codecs/cs35l41-spi.c                     |  4 +-
 sound/soc/codecs/pcm3168a-spi.c                    |  4 +-
 sound/soc/codecs/pcm512x-spi.c                     |  3 +-
 sound/soc/codecs/tlv320aic32x4-spi.c               |  4 +-
 sound/soc/codecs/tlv320aic3x-spi.c                 |  4 +-
 sound/soc/codecs/wm0010.c                          |  4 +-
 sound/soc/codecs/wm8804-spi.c                      |  3 +-
 sound/spi/at73c213.c                               |  4 +-
 198 files changed, 248 insertions(+), 617 deletions(-)

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-03-07  0:13 Stephen Rothwell
@ 2022-03-07  7:16 ` Uwe Kleine-König
  2022-03-07 13:04 ` Mark Brown
  1 sibling, 0 replies; 109+ messages in thread
From: Uwe Kleine-König @ 2022-03-07  7:16 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Mark Brown, Maxime Ripard, Noralf Trønnes,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hello Stephen,

On Mon, Mar 07, 2022 at 11:13:42AM +1100, Stephen Rothwell wrote:
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/tiny/panel-mipi-dbi.c:391:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
>   391 |         .remove = panel_mipi_dbi_spi_remove,
>       |                   ^~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")
> 
> interacting with commit
> 
>   a0386bba7093 ("spi: make remove callback a void function")
> 
> from the spi trees.
> 
> I have applied the following merge fix.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 Mar 2022 11:01:01 +1100
> Subject: [PATCH] fix up for "spi: make remove callback a void function"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tiny/panel-mipi-dbi.c b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
> index 7f8c6c51387f..c759ff9c2c87 100644
> --- a/drivers/gpu/drm/tiny/panel-mipi-dbi.c
> +++ b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
> @@ -336,14 +336,12 @@ static int panel_mipi_dbi_spi_probe(struct spi_device *spi)
>  	return 0;
>  }
>  
> -static int panel_mipi_dbi_spi_remove(struct spi_device *spi)
> +static void panel_mipi_dbi_spi_remove(struct spi_device *spi)
>  {
>  	struct drm_device *drm = spi_get_drvdata(spi);
>  
>  	drm_dev_unplug(drm);
>  	drm_atomic_helper_shutdown(drm);
> -
> -	return 0;
>  }
>  
>  static void panel_mipi_dbi_spi_shutdown(struct spi_device *spi)

Looks right, thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-03-07  0:13 Stephen Rothwell
  2022-03-07  7:16 ` Uwe Kleine-König
  2022-03-07 13:04 ` Mark Brown
  0 siblings, 2 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-03-07  0:13 UTC (permalink / raw)
  To: Alex Deucher, Mark Brown
  Cc: Uwe Kleine-König, Maxime Ripard, Noralf Trønnes,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/tiny/panel-mipi-dbi.c:391:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
  391 |         .remove = panel_mipi_dbi_spi_remove,
      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")

interacting with commit

  a0386bba7093 ("spi: make remove callback a void function")

from the spi trees.

I have applied the following merge fix.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Mar 2022 11:01:01 +1100
Subject: [PATCH] fix up for "spi: make remove callback a void function"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/tiny/panel-mipi-dbi.c b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
index 7f8c6c51387f..c759ff9c2c87 100644
--- a/drivers/gpu/drm/tiny/panel-mipi-dbi.c
+++ b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
@@ -336,14 +336,12 @@ static int panel_mipi_dbi_spi_probe(struct spi_device *spi)
 	return 0;
 }
 
-static int panel_mipi_dbi_spi_remove(struct spi_device *spi)
+static void panel_mipi_dbi_spi_remove(struct spi_device *spi)
 {
 	struct drm_device *drm = spi_get_drvdata(spi);
 
 	drm_dev_unplug(drm);
 	drm_atomic_helper_shutdown(drm);
-
-	return 0;
 }
 
 static void panel_mipi_dbi_spi_shutdown(struct spi_device *spi)
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-02-15  0:57 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-02-15  0:57 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Bas Nieuwenhuizen, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c: In function 'dc_construct':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:991:17: error: implicit declaration of function 'DC_FP_START' [-Werror=implicit-function-declaration]
  991 |                 DC_FP_START();
      |                 ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:993:17: error: implicit declaration of function 'DC_FP_END' [-Werror=implicit-function-declaration]
  993 |                 DC_FP_END();
      |                 ^~~~~~~~~

Caused by commit

  af45a5fe4f0a ("drm/amd/display: Protect update_bw_bounding_box FPU code.")

I have used the amdgpu tree from next-20220214 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-02-01 18:32 ` Limonciello, Mario
@ 2022-02-01 18:53   ` Alex Deucher
  0 siblings, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2022-02-01 18:53 UTC (permalink / raw)
  To: Limonciello, Mario
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List

Go for it.  I'll squash it into my next -next update.

Alex

On Tue, Feb 1, 2022 at 1:32 PM Limonciello, Mario
<mario.limonciello@amd.com> wrote:
>
> Thanks for the fix.
>
> Alex if no concerns I'll push this patch from Stephen to
> amd-staging-drm-next with my tag.
>
> On 1/31/2022 21:32, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:43:
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h: In function 'amdgpu_acpi_is_s3_active':
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h:1428:87: error: expected ';' before '}' token
> >   1428 | static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
> >        |                                                                                       ^~
> >        |                                                                                       ;
> >
> > (and many more)
> >
> > Caused by commit
> >
> >    11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 1 Feb 2022 14:24:40 +1100
> > Subject: [PATCH] drm/amd: fix semicolon positioning
> >
> > Fixes: 11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > index e61078cec072..2931c8ff4cc6 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > @@ -1425,7 +1425,7 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);
> >   bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);
> >   #else
> >   static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }
> > -static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
> > +static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }
> >   #endif
> >
> >   int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
>

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-02-01  3:32 Stephen Rothwell
@ 2022-02-01 18:32 ` Limonciello, Mario
  2022-02-01 18:53   ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Limonciello, Mario @ 2022-02-01 18:32 UTC (permalink / raw)
  To: Stephen Rothwell, Alex Deucher
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

Thanks for the fix.

Alex if no concerns I'll push this patch from Stephen to 
amd-staging-drm-next with my tag.

On 1/31/2022 21:32, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:43:
> drivers/gpu/drm/amd/amdgpu/amdgpu.h: In function 'amdgpu_acpi_is_s3_active':
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1428:87: error: expected ';' before '}' token
>   1428 | static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
>        |                                                                                       ^~
>        |                                                                                       ;
> 
> (and many more)
> 
> Caused by commit
> 
>    11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 1 Feb 2022 14:24:40 +1100
> Subject: [PATCH] drm/amd: fix semicolon positioning
> 
> Fixes: 11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index e61078cec072..2931c8ff4cc6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1425,7 +1425,7 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);
>   bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);
>   #else
>   static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }
> -static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
> +static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }
>   #endif
>   
>   int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,


^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-02-01  3:32 Stephen Rothwell
  2022-02-01 18:32 ` Limonciello, Mario
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-02-01  3:32 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Mario Limonciello, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c:43:
drivers/gpu/drm/amd/amdgpu/amdgpu.h: In function 'amdgpu_acpi_is_s3_active':
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1428:87: error: expected ';' before '}' token
 1428 | static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
      |                                                                                       ^~
      |                                                                                       ;

(and many more)

Caused by commit

  11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Feb 2022 14:24:40 +1100
Subject: [PATCH] drm/amd: fix semicolon positioning

Fixes: 11bc42ea179d ("drm/amd: add support to check whether the system is set to s3")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index e61078cec072..2931c8ff4cc6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1425,7 +1425,7 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);
 bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);
 #else
 static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }
-static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false };
+static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }
 #endif
 
 int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-01-26 23:42 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-01-26 23:42 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Tim Huang, Tim Huang, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the amdgpu 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 'dm_dmub_hw_init':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:1030:20: error: unused variable 'dc' [-Werror=unused-variable]
 1030 |         struct dc *dc = adev->dm.dc;
      |                    ^~

Caused by commit

  3b36f50d3a69 ("drm/amd/display: convert to DCE IP version checking")

I have used the amdgu tree from next-20220125 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2022-01-14  0:36 Stephen Rothwell
@ 2022-01-14 23:25 ` Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2022-01-14 23:25 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linus Torvalds, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi all,

On Fri, 14 Jan 2022 11:36:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c: In function 'program_timing_sync':
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1409:17: error: 'struct dc_config' has no member named 'use_pipe_ctx_sync_logic'
>  1409 |   if (dc->config.use_pipe_ctx_sync_logic) {
>       |                 ^
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1412:20: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
>  1412 |     if (pipe_set[j]->pipe_idx_syncd == pipe_set[0]->pipe_idx_syncd) {
>       |                    ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1412:51: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
>  1412 |     if (pipe_set[j]->pipe_idx_syncd == pipe_set[0]->pipe_idx_syncd) {
>       |                                                   ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1418:17: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
>  1418 |      pipe_set[j]->pipe_idx_syncd = pipe_set[0]->pipe_idx_syncd;
>       |                 ^~
> drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1418:47: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
>  1418 |      pipe_set[j]->pipe_idx_syncd = pipe_set[0]->pipe_idx_syncd;
>       |                                               ^~
> 
> Caused by git doing a bad automatic merge with Linus' tree because commit
> 
>   75b950ef6166 ("Revert "drm/amd/display: Fix for otg synchronization logic"")
> 
> has been cherry-picked into the amdgpu tree and then a fixed version of
> the reverted commit applied on top.  It would be easier if just a
> fix up for the oriingal commit was added to the amdgpu tree, or Linus'
> tree was merged into the amdgpu tree and then the fixed version applied.
> 
> I have used the amdgpu tree from next-20220113 for today.

This is what I have had to apply as a merge fix up to make this work:

(This is basically all the files that were not changed by the revert and
fix pair of patches)

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 15 Jan 2022 10:01:47 +1100
Subject: [PATCH] fix up for bad merge due to cherry-picked and fixed commit

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 .../gpu/drm/amd/display/dc/core/dc_resource.c | 54 +++++++++++++++++++
 drivers/gpu/drm/amd/display/dc/dc.h           |  1 +
 .../display/dc/dce110/dce110_hw_sequencer.c   |  8 +++
 .../drm/amd/display/dc/dcn31/dcn31_resource.c |  3 ++
 .../gpu/drm/amd/display/dc/inc/core_types.h   |  1 +
 5 files changed, 67 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index d4ff6cc6b8d9..b3912ff9dc91 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -3217,6 +3217,60 @@ struct hpo_dp_link_encoder *resource_get_hpo_dp_link_enc_for_det_lt(
 }
 #endif
 
+void reset_syncd_pipes_from_disabled_pipes(struct dc *dc,
+		struct dc_state *context)
+{
+	int i, j;
+	struct pipe_ctx *pipe_ctx_old, *pipe_ctx, *pipe_ctx_syncd;
+
+	/* If pipe backend is reset, need to reset pipe syncd status */
+	for (i = 0; i < dc->res_pool->pipe_count; i++) {
+		pipe_ctx_old =	&dc->current_state->res_ctx.pipe_ctx[i];
+		pipe_ctx = &context->res_ctx.pipe_ctx[i];
+
+		if (!pipe_ctx_old->stream)
+			continue;
+
+		if (pipe_ctx_old->top_pipe || pipe_ctx_old->prev_odm_pipe)
+			continue;
+
+		if (!pipe_ctx->stream ||
+				pipe_need_reprogram(pipe_ctx_old, pipe_ctx)) {
+
+			/* Reset all the syncd pipes from the disabled pipe */
+			for (j = 0; j < dc->res_pool->pipe_count; j++) {
+				pipe_ctx_syncd = &context->res_ctx.pipe_ctx[j];
+				if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx_syncd) == pipe_ctx_old->pipe_idx) ||
+					!IS_PIPE_SYNCD_VALID(pipe_ctx_syncd))
+					SET_PIPE_SYNCD_TO_PIPE(pipe_ctx_syncd, j);
+			}
+		}
+	}
+}
+
+void check_syncd_pipes_for_disabled_master_pipe(struct dc *dc,
+	struct dc_state *context,
+	uint8_t disabled_master_pipe_idx)
+{
+	int i;
+	struct pipe_ctx *pipe_ctx, *pipe_ctx_check;
+
+	pipe_ctx = &context->res_ctx.pipe_ctx[disabled_master_pipe_idx];
+	if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx) != disabled_master_pipe_idx) ||
+		!IS_PIPE_SYNCD_VALID(pipe_ctx))
+		SET_PIPE_SYNCD_TO_PIPE(pipe_ctx, disabled_master_pipe_idx);
+
+	/* for the pipe disabled, check if any slave pipe exists and assert */
+	for (i = 0; i < dc->res_pool->pipe_count; i++) {
+		pipe_ctx_check = &context->res_ctx.pipe_ctx[i];
+
+		if ((GET_PIPE_SYNCD_FROM_PIPE(pipe_ctx_check) == disabled_master_pipe_idx) &&
+			IS_PIPE_SYNCD_VALID(pipe_ctx_check) && (i != disabled_master_pipe_idx))
+			DC_ERR("DC: Failure: pipe_idx[%d] syncd with disabled master pipe_idx[%d]\n",
+				i, disabled_master_pipe_idx);
+	}
+}
+
 uint8_t resource_transmitter_to_phy_idx(const struct dc *dc, enum transmitter transmitter)
 {
 	/* TODO - get transmitter to phy idx mapping from DMUB */
diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index da2c78ce14d6..288e7b01f561 100644
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -344,6 +344,7 @@ struct dc_config {
 	uint8_t  vblank_alignment_max_frame_time_diff;
 	bool is_asymmetric_memory;
 	bool is_single_rank_dimm;
+	bool use_pipe_ctx_sync_logic;
 };
 
 enum visual_confirm {
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 78192ecba102..f1593186e964 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1566,6 +1566,10 @@ static enum dc_status apply_single_controller_ctx_to_hw(
 				&pipe_ctx->stream->audio_info);
 	}
 
+	/* make sure no pipes syncd to the pipe being enabled */
+	if (!pipe_ctx->stream->apply_seamless_boot_optimization && dc->config.use_pipe_ctx_sync_logic)
+		check_syncd_pipes_for_disabled_master_pipe(dc, context, pipe_ctx->pipe_idx);
+
 #if defined(CONFIG_DRM_AMD_DC_DCN)
 	/* DCN3.1 FPGA Workaround
 	 * Need to enable HPO DP Stream Encoder before setting OTG master enable.
@@ -2297,6 +2301,10 @@ enum dc_status dce110_apply_ctx_to_hw(
 	enum dc_status status;
 	int i;
 
+	/* reset syncd pipes from disabled pipes */
+	if (dc->config.use_pipe_ctx_sync_logic)
+		reset_syncd_pipes_from_disabled_pipes(dc, context);
+
 	/* Reset old context */
 	/* look up the targets that have been removed since last commit */
 	hws->funcs.reset_hw_ctx_wrap(dc, context);
diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
index 42ed47e8133d..8d64187478e4 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
@@ -2260,6 +2260,9 @@ static bool dcn31_resource_construct(
 	dc->caps.color.mpc.ogam_rom_caps.hlg = 0;
 	dc->caps.color.mpc.ocsc = 1;
 
+	/* Use pipe context based otg sync logic */
+	dc->config.use_pipe_ctx_sync_logic = true;
+
 	/* read VBIOS LTTPR caps */
 	{
 		if (ctx->dc_bios->funcs->get_lttpr_caps) {
diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index 890280026e69..943240e2809e 100644
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -382,6 +382,7 @@ struct pipe_ctx {
 	struct pll_settings pll_settings;
 
 	uint8_t pipe_idx;
+	uint8_t pipe_idx_syncd;
 
 	struct pipe_ctx *top_pipe;
 	struct pipe_ctx *bottom_pipe;
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2022-01-14  0:36 Stephen Rothwell
  2022-01-14 23:25 ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2022-01-14  0:36 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linus Torvalds, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c: In function 'program_timing_sync':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1409:17: error: 'struct dc_config' has no member named 'use_pipe_ctx_sync_logic'
 1409 |   if (dc->config.use_pipe_ctx_sync_logic) {
      |                 ^
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1412:20: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1412 |     if (pipe_set[j]->pipe_idx_syncd == pipe_set[0]->pipe_idx_syncd) {
      |                    ^~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1412:51: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1412 |     if (pipe_set[j]->pipe_idx_syncd == pipe_set[0]->pipe_idx_syncd) {
      |                                                   ^~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1418:17: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1418 |      pipe_set[j]->pipe_idx_syncd = pipe_set[0]->pipe_idx_syncd;
      |                 ^~
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1418:47: error: 'struct pipe_ctx' has no member named 'pipe_idx_syncd'
 1418 |      pipe_set[j]->pipe_idx_syncd = pipe_set[0]->pipe_idx_syncd;
      |                                               ^~

Caused by git doing a bad automatic merge with Linus' tree because commit

  75b950ef6166 ("Revert "drm/amd/display: Fix for otg synchronization logic"")

has been cherry-picked into the amdgpu tree and then a fixed version of
the reverted commit applied on top.  It would be easier if just a
fix up for the oriingal commit was added to the amdgpu tree, or Linus'
tree was merged into the amdgpu tree and then the fixed version applied.

I have used the amdgpu tree from next-20220113 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-12-03  1:11 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-12-03  1:11 UTC (permalink / raw)
  To: Alex Deucher, Dave Airlie, DRI
  Cc: Flora Cui, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c: In function 'amdgpu_vkms_sw_fini':
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:521:34: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  521 |   if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
      |                                  ^
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:522:47: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  522 |    hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
      |                                               ^

Caused by commit

  deefd07eedb7 ("drm/amdgpu: fix vkms crtc settings")

interacting with commit

  3e467e478ed3 ("drm/amdgpu: cancel the correct hrtimer on exit")

from the drm-fixes tree.  The problem is that this latter patch also
appears in the amdgpu tree as a different commit and git resolves it
incorrectly in the presence of the former commit :-(

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Dec 2021 12:06:57 +1100
Subject: [PATCH] fix up for "drm/amdgpu: cancel the correct hrtimer on exit"

interacting with "drm/amdgpu: fix vkms crtc settings"

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index e07fc64b655e..6c62c45e3e3e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -518,8 +518,8 @@ static int amdgpu_vkms_sw_fini(void *handle)
 	int i = 0;
 
 	for (i = 0; i < adev->mode_info.num_crtc; i++)
-		if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
-			hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
+		if (adev->mode_info.crtcs[i])
+			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);
 
 	kfree(adev->mode_info.bios_hardcoded_edid);
 	kfree(adev->amdgpu_vkms_output);
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-11-18  4:23 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-11-18  4:23 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Leo (Hanghong) Ma, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c: In function 'dp_retrieve_lttpr_cap':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link_dp.c:4623:4: error: implicit declaration of function 'DC_LOG_DP2'; did you mean 'DC_LOG_DML'? [-Werror=implicit-function-declaration]
 4623 |    DC_LOG_DP2("%s: Read LTTPR caps data failed.\n", __func__);
      |    ^~~~~~~~~~
      |    DC_LOG_DML

Caused by commit

  9c0dc981c97d ("drm/amd/display: Reduce dmesg error to a debug print")

I have used the version of th amdgpu tree from next-20211117 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-12  2:25 ` Stephen Rothwell
@ 2021-10-12 13:32   ` Alex Deucher
  0 siblings, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2021-10-12 13:32 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Simon Ser, Linux Kernel Mailing List, Linux Next Mailing List

On Mon, Oct 11, 2021 at 10:25 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Stephen,
>
> On Fri, 8 Oct 2021 11:31:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > ERROR: modpost: "get_mm_exe_file" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> >
> > Caused by commit
> >
> >   f4f80155e6e8 ("amd/display: only require overlay plane to cover whole CRTC on ChromeOS")
> >
> > I have used the amdgpu tree from next-20211007 for today.
>
> This failure has returned today ...

Whoops, pushed the wrong branch.  Fixed.

Alex

> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08  0:31 Stephen Rothwell
  2021-10-08  6:27 ` Simon Ser
@ 2021-10-12  2:25 ` Stephen Rothwell
  2021-10-12 13:32   ` Alex Deucher
  1 sibling, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2021-10-12  2:25 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Simon Ser, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi Stephen,

On Fri, 8 Oct 2021 11:31:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "get_mm_exe_file" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> 
> Caused by commit
> 
>   f4f80155e6e8 ("amd/display: only require overlay plane to cover whole CRTC on ChromeOS")
> 
> I have used the amdgpu tree from next-20211007 for today.

This failure has returned today ...
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-11  8:01                       ` Christoph Hellwig
@ 2021-10-11  8:21                         ` Simon Ser
  0 siblings, 0 replies; 109+ messages in thread
From: Simon Ser @ 2021-10-11  8:21 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Alex Deucher, Stephen Rothwell, Linux Kernel Mailing List,
	Linux Next Mailing List, Daniel Vetter, Benson Leung,
	Enric Balletbo i Serra, Greg Kroah-Hartman

On Monday, October 11th, 2021 at 10:01, Christoph Hellwig <hch@lst.de> wrote:

> On Mon, Oct 11, 2021 at 07:57:17AM +0000, Simon Ser wrote:
> > No, we can't have a "I_AM_NOT_BROKEN" ioctl for each and every uAPI mis-use.
> > User-space detection has been determined to be the best course of action.
>
> If your API addition breaks userspace, yes you need an add-in.

It's not an API addition. It's a ChromeOS fix that breaks my user-space.

> With your completely broken change you cement in a mapping of an executable
> name to map to what you consider a "bug" without any way to fix it up.

If that's the only concern, it'd be very easy to add a CAP_ATOMIC >= 2 check
like we have for Xorg. This would make it so ChromeOS can eventually opt-out
of the quirk.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-11  7:57                     ` Simon Ser
@ 2021-10-11  8:01                       ` Christoph Hellwig
  2021-10-11  8:21                         ` Simon Ser
  0 siblings, 1 reply; 109+ messages in thread
From: Christoph Hellwig @ 2021-10-11  8:01 UTC (permalink / raw)
  To: Simon Ser
  Cc: Christoph Hellwig, Alex Deucher, Stephen Rothwell,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Daniel Vetter, Benson Leung, Enric Balletbo i Serra,
	Greg Kroah-Hartman

On Mon, Oct 11, 2021 at 07:57:17AM +0000, Simon Ser wrote:
> No, we can't have a "I_AM_NOT_BROKEN" ioctl for each and every uAPI mis-use.
> User-space detection has been determined to be the best course of action.

If your API addition breaks userspace, yes you need an add-in.

> I guess I'll just inline these functions in the driver then, if a revert will
> be NACK'ed by you?

It will be NACKed, and I will also complain to Linus about any PR containing
buggy code like this.

With your completely broken change you cement in a mapping of an executable
name to map to what you consider a "bug" without any way to fix it up.

Which is even worse for a something fast moving like chrome/chromeos which
will eventually gets its act together and fix things while you'll keep a
weird feature mismatch just for it around forever.

No wonder our graphics stack is stuch a convoluted buggy mess if you keep
piling broken workarounds over workarounds instead of sorting things out
properly.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-11  7:51                   ` Christoph Hellwig
@ 2021-10-11  7:57                     ` Simon Ser
  2021-10-11  8:01                       ` Christoph Hellwig
  0 siblings, 1 reply; 109+ messages in thread
From: Simon Ser @ 2021-10-11  7:57 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Alex Deucher, Stephen Rothwell, Linux Kernel Mailing List,
	Linux Next Mailing List, Daniel Vetter

On Monday, October 11th, 2021 at 09:51, Christoph Hellwig <hch@lst.de> wrote:

> On Mon, Oct 11, 2021 at 07:49:44AM +0000, Simon Ser wrote:
> > Have you heard about the kernel no-regression rule? Here, we can't enable a new
> > feature because that would regress user-space which mis-uses the kernel uAPI.
>
> Then you can't enable the feature without an explicit opt-in from
> userspace.  This ain't rocket science.

No, we can't have a "I_AM_NOT_BROKEN" ioctl for each and every uAPI mis-use.
User-space detection has been determined to be the best course of action.

> > If your reply wasn't aggressive, I don't know what it is.
>
> If there is one thing I find agressive it is your extreme passive
> aggressive behavior.

Come on. I'm just asking you to be civil, that's all. But that seems too much.

* * *

I guess I'll just inline these functions in the driver then, if a revert will
be NACK'ed by you?

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-11  7:49                 ` Simon Ser
@ 2021-10-11  7:51                   ` Christoph Hellwig
  2021-10-11  7:57                     ` Simon Ser
  0 siblings, 1 reply; 109+ messages in thread
From: Christoph Hellwig @ 2021-10-11  7:51 UTC (permalink / raw)
  To: Simon Ser
  Cc: Christoph Hellwig, Alex Deucher, Stephen Rothwell,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Daniel Vetter

On Mon, Oct 11, 2021 at 07:49:44AM +0000, Simon Ser wrote:
> Have you heard about the kernel no-regression rule? Here, we can't enable a new
> feature because that would regress user-space which mis-uses the kernel uAPI.

Then you can't enable the feature without an explicit opt-in from
userspace.  This ain't rocket science.

> If your reply wasn't aggressive, I don't know what it is.

If there is one thing I find agressive it is your extreme passive
aggressive behavior.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-11  7:43               ` Christoph Hellwig
@ 2021-10-11  7:49                 ` Simon Ser
  2021-10-11  7:51                   ` Christoph Hellwig
  0 siblings, 1 reply; 109+ messages in thread
From: Simon Ser @ 2021-10-11  7:49 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Alex Deucher, Stephen Rothwell, Linux Kernel Mailing List,
	Linux Next Mailing List, Daniel Vetter

On Monday, October 11th, 2021 at 09:43, Christoph Hellwig <hch@lst.de> wrote:

> On Mon, Oct 11, 2021 at 07:39:52AM +0000, Simon Ser wrote:
> > I don't understand. Can you elaborate why you think this commit is
> > "utter crap"?
>
> A kernel driver has absolutely no business making decissions based
> on current->comm, which can be changed by any userspace process.  This
> is kernel programming 101.
>
> Independent of that a check for a specific program as the callers makes
> no sense whatsoever as a given program and change over time.  This is
> not even something kernel specific but something that ever software
> engineer should do.

Have you heard about the kernel no-regression rule? Here, we can't enable a new
feature because that would regress user-space which mis-uses the kernel uAPI.

This isn't unheard of. Core drm already detects Xorg with current->comm, and
force-disables atomic KMS.

> > I'd also appreciate if you could be a bit less aggressive. There's
> > nothing "obvious" about this from my point of view.
>
> I'm not agressive.  I'm just really disappointed by the amoubt of crap
> that gets shovelled into the kernel and even more disappointed by the
> abslutely lack of knowledge of some of the contributors.

If your reply wasn't aggressive, I don't know what it is.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-11  7:39             ` Simon Ser
@ 2021-10-11  7:43               ` Christoph Hellwig
  2021-10-11  7:49                 ` Simon Ser
  0 siblings, 1 reply; 109+ messages in thread
From: Christoph Hellwig @ 2021-10-11  7:43 UTC (permalink / raw)
  To: Simon Ser
  Cc: Christoph Hellwig, Alex Deucher, Stephen Rothwell,
	Linux Kernel Mailing List, Linux Next Mailing List

On Mon, Oct 11, 2021 at 07:39:52AM +0000, Simon Ser wrote:
> I don't understand. Can you elaborate why you think this commit is
> "utter crap"?

A kernel driver has absolutely no business making decissions based
on current->comm, which can be changed by any userspace process.  This
is kernel programming 101.

Independent of that a check for a specific program as the callers makes
no sense whatsoever as a given program and change over time.  This is
not even something kernel specific but something that ever software
engineer should do.

> I'd also appreciate if you could be a bit less aggressive. There's
> nothing "obvious" about this from my point of view.

I'm not agressive.  I'm just really disappointed by the amoubt of crap
that gets shovelled into the kernel and even more disappointed by the
abslutely lack of knowledge of some of the contributors.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-11  7:33           ` Christoph Hellwig
@ 2021-10-11  7:39             ` Simon Ser
  2021-10-11  7:43               ` Christoph Hellwig
  0 siblings, 1 reply; 109+ messages in thread
From: Simon Ser @ 2021-10-11  7:39 UTC (permalink / raw)
  To: Christoph Hellwig
  Cc: Alex Deucher, Stephen Rothwell, Linux Kernel Mailing List,
	Linux Next Mailing List

On Monday, October 11th, 2021 at 09:33, Christoph Hellwig <hch@lst.de> wrote:

> On Fri, Oct 08, 2021 at 06:07:33PM +0000, Simon Ser wrote:
>
> > Would it be reasonable to re-export get_mm_exe_file? amdgpu uses it here:
> >
> > https://gitlab.freedesktop.org/agd5f/linux/-/commit/0d4da915c7098eca2aa6f559f42e33b5e9c7c5e8
>
> Seriously? No, it obviously not. Unexporting it is important to catch
> utter crap like in that commit which should have never made it into a
> maintainer tree.

I don't understand. Can you elaborate why you think this commit is
"utter crap"?

I'd also appreciate if you could be a bit less aggressive. There's
nothing "obvious" about this from my point of view.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08 18:07         ` Simon Ser
@ 2021-10-11  7:33           ` Christoph Hellwig
  2021-10-11  7:39             ` Simon Ser
  0 siblings, 1 reply; 109+ messages in thread
From: Christoph Hellwig @ 2021-10-11  7:33 UTC (permalink / raw)
  To: Simon Ser
  Cc: Alex Deucher, Christoph Hellwig, Stephen Rothwell,
	Linux Kernel Mailing List, Linux Next Mailing List

On Fri, Oct 08, 2021 at 06:07:33PM +0000, Simon Ser wrote:
> Would it be reasonable to re-export get_mm_exe_file? amdgpu uses it here:
> 
> https://gitlab.freedesktop.org/agd5f/linux/-/commit/0d4da915c7098eca2aa6f559f42e33b5e9c7c5e8

Seriously?  No, it obviously not.  Unexporting it is important to catch
utter crap like in that commit which should have never made it into a
maintainer tree.

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08  9:22     ` Simon Ser
  2021-10-08 14:11       ` Alex Deucher
@ 2021-10-09  4:57       ` Stephen Rothwell
  1 sibling, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-10-09  4:57 UTC (permalink / raw)
  To: Simon Ser
  Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi Simon,

On Fri, 08 Oct 2021 09:22:16 +0000 Simon Ser <contact@emersion.fr> wrote:
>
> On Friday, October 8th, 2021 at 10:29, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > That symbol (get_mm_exe_file) is not exported to modules.  
> 
> I see this:
> 
>     EXPORT_SYMBOL(get_mm_exe_file);
> 
> in kernel/fork.c

That was remove by commit

  05da8113c9ba ("kernel/fork.c: unexport get_{mm,task}_exe_file")

which is in v5.15-rc1.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08 14:11       ` Alex Deucher
@ 2021-10-08 18:07         ` Simon Ser
  2021-10-11  7:33           ` Christoph Hellwig
  0 siblings, 1 reply; 109+ messages in thread
From: Simon Ser @ 2021-10-08 18:07 UTC (permalink / raw)
  To: Alex Deucher, Christoph Hellwig
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List

On Friday, October 8th, 2021 at 16:11, Alex Deucher <alexdeucher@gmail.com> wrote:

> On Fri, Oct 8, 2021 at 5:22 AM Simon Ser contact@emersion.fr wrote:
>
> > On Friday, October 8th, 2021 at 10:29, Stephen Rothwell sfr@canb.auug.org.au wrote:
> >
> > > That symbol (get_mm_exe_file) is not exported to modules.
> >
> > I see this:
> >
> >     EXPORT_SYMBOL(get_mm_exe_file);
> >
> >
> > in kernel/fork.c
>
> Was recently removed:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/kernel/fork.c?id=05da8113c9ba63a8913e6c73dc06ed01cae55f68
>
> I guess we need to rethink that patch.

CC Christoph

Would it be reasonable to re-export get_mm_exe_file? amdgpu uses it here:

https://gitlab.freedesktop.org/agd5f/linux/-/commit/0d4da915c7098eca2aa6f559f42e33b5e9c7c5e8

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08  9:22     ` Simon Ser
@ 2021-10-08 14:11       ` Alex Deucher
  2021-10-08 18:07         ` Simon Ser
  2021-10-09  4:57       ` Stephen Rothwell
  1 sibling, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2021-10-08 14:11 UTC (permalink / raw)
  To: Simon Ser
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List

On Fri, Oct 8, 2021 at 5:22 AM Simon Ser <contact@emersion.fr> wrote:
>
> On Friday, October 8th, 2021 at 10:29, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > That symbol (get_mm_exe_file) is not exported to modules.
>
> I see this:
>
>     EXPORT_SYMBOL(get_mm_exe_file);
>
> in kernel/fork.c

Was recently removed:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/kernel/fork.c?id=05da8113c9ba63a8913e6c73dc06ed01cae55f68
I guess we need to rethink that patch.

Alex

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08  8:29   ` Stephen Rothwell
@ 2021-10-08  9:22     ` Simon Ser
  2021-10-08 14:11       ` Alex Deucher
  2021-10-09  4:57       ` Stephen Rothwell
  0 siblings, 2 replies; 109+ messages in thread
From: Simon Ser @ 2021-10-08  9:22 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List

On Friday, October 8th, 2021 at 10:29, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> That symbol (get_mm_exe_file) is not exported to modules.

I see this:

    EXPORT_SYMBOL(get_mm_exe_file);

in kernel/fork.c

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08  6:27 ` Simon Ser
@ 2021-10-08  8:29   ` Stephen Rothwell
  2021-10-08  9:22     ` Simon Ser
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2021-10-08  8:29 UTC (permalink / raw)
  To: Simon Ser
  Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi Simon,

On Fri, 08 Oct 2021 06:27:05 +0000 Simon Ser <contact@emersion.fr> wrote:
>
> On Friday, October 8th, 2021 at 02:31, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > ERROR: modpost: "get_mm_exe_file" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> >
> > Caused by commit
> >
> > f4f80155e6e8 ("amd/display: only require overlay plane to cover whole CRTC on ChromeOS")
> >
> > I have used the amdgpu tree from next-20211007 for today.  
> 
> Not sure why this would happen. This commit builds fine on my machine, and I
> don't think it's possible to disable this function with Kconfig?

That symbol (get_mm_exe_file) is not exported to modules.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-10-08  0:31 Stephen Rothwell
@ 2021-10-08  6:27 ` Simon Ser
  2021-10-08  8:29   ` Stephen Rothwell
  2021-10-12  2:25 ` Stephen Rothwell
  1 sibling, 1 reply; 109+ messages in thread
From: Simon Ser @ 2021-10-08  6:27 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List

On Friday, October 8th, 2021 at 02:31, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: modpost: "get_mm_exe_file" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
>
> Caused by commit
>
> f4f80155e6e8 ("amd/display: only require overlay plane to cover whole CRTC on ChromeOS")
>
> I have used the amdgpu tree from next-20211007 for today.

Not sure why this would happen. This commit builds fine on my machine, and I
don't think it's possible to disable this function with Kconfig?

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-10-08  0:31 Stephen Rothwell
  2021-10-08  6:27 ` Simon Ser
  2021-10-12  2:25 ` Stephen Rothwell
  0 siblings, 2 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-10-08  0:31 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Simon Ser, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

ERROR: modpost: "get_mm_exe_file" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

Caused by commit

  f4f80155e6e8 ("amd/display: only require overlay plane to cover whole CRTC on ChromeOS")

I have used the amdgpu tree from next-20211007 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-09-29  1:20 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-09-29  1:20 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Michael Strauss, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c: In function 'process_deferred_updates':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:1808:21: error: 'struct dc' has no member named 'dcn_ip'
 1808 |   for (i = 0; i < dc->dcn_ip->max_num_dpp; i++)
      |                     ^~

Caused by commit

  bfd34644dedb ("drm/amd/display: Defer LUT memory powerdown until LUT bypass latches")

CONFIG_DRM_AMD_DC_DCN is not set for this build.

I have used the amdgpu tree from next-20210928 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-09-17  0:57 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-09-17  0:57 UTC (permalink / raw)
  To: Alex Deucher, Daniel Vetter
  Cc: Andrey Grodzovsky, Linux Kernel Mailing List,
	Linux Next Mailing List, DRI, Intel Graphics

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

Hi all,

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

In file included from include/drm/ttm/ttm_bo_driver.h:40,
                 from include/drm/drm_gem_ttm_helper.h:11,
                 from drivers/gpu/drm/drm_gem_ttm_helper.c:5:
include/drm/ttm/ttm_device.h:274:19: error: duplicate member 'pinned'
  274 |  struct list_head pinned;
      |                   ^~~~~~

Caused by commit

  59084e464297 ("drm/ttm: Create pinned list")

interacting with commit

  32eadf52d449 ("drm/ttm: Create pinned list")

from the drm-misc tree.

The automatic merge proved incorrect, so I have removed one of the
insertions.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: Build failure after merge of the amdgpu tree
@ 2021-08-02 15:55 Mark Brown
  0 siblings, 0 replies; 109+ messages in thread
From: Mark Brown @ 2021-08-02 15:55 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List,
	Eric Huang

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

Hi all,

Today's linux-next merge of the amdgpu tree failed to build an x86
allmodconfig due to:

/tmp/next/build/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_map_memory_to_gpu':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1723:6: error: 'table_freed' undeclared (first use in this function); did you mean 'HPG_freed'?
  if (table_freed && (adev->asic_type != CHIP_ALDEBARAN))
      ^~~~~~~~~~~
      HPG_freed

Probably due to f451e2cab940791c1 (Revert "Revert "drm/amdkfd: Only
apply TLB flush optimization on ALdebaran"").

I will use the amdgpu tree from Friday instead.

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-05-27  5:58 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-05-27  5:58 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

ld: drivers/gpu/drm/amd/amdgpu/amdgpu_device.o:(.opd+0x408): multiple definition of `amdgpu_acpi_detect'; drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o:(.opd+0x1c8): first defined here
ld: drivers/gpu/drm/amd/amdgpu/amdgpu_device.o: in function `.amdgpu_acpi_detect':
amdgpu_device.c:(.text.amdgpu_acpi_detect+0x0): multiple definition of `.amdgpu_acpi_detect'; drivers/gpu/drm/amd/amdgpu/amdgpu_drv.o:amdgpu_drv.c:(.text.amdgpu_acpi_detect+0x0): first defined here

and many, many more.

Caused by commit

  753c7d6d85f5 ("drm/amdgpu/acpi: make ATPX/ATCS structures global")

The !defined(CONFIG_ACPI) version of amdgpu_acpi_detect() is missing
"static inline" ...

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-05-10 22:23       ` Alex Deucher
@ 2021-05-10 23:02         ` Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-05-10 23:02 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Stephen Rothwell, Jude Shih, Hanghong Ma, Nicholas Kazlauskas,
	Daniel Wheeler, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi Alex,

On Mon, 10 May 2021 18:23:35 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> On Mon, May 10, 2021 at 6:18 PM Stephen Rothwell <sfr@rothwell.id.au> wrote:
> >
> > On Mon, 10 May 2021 10:24:58 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:  
> > >
> > > Fixed in this patch set:
> > > https://patchwork.freedesktop.org/series/89890/  
> >
> > Sure, but that is not in the amdgpu tree that linux-next includes
> > (https://gitlab.freedesktop.org/agd5f/linux#drm-next).  Did you forget
> > to push it out, or is it still being reviewed/tested?  
> 
> Was still being reviewed.  I just pushed out the tree with it included.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-05-10 22:18     ` Stephen Rothwell
@ 2021-05-10 22:23       ` Alex Deucher
  2021-05-10 23:02         ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2021-05-10 22:23 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Stephen Rothwell, Jude Shih, Hanghong Ma, Nicholas Kazlauskas,
	Daniel Wheeler, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

On Mon, May 10, 2021 at 6:18 PM Stephen Rothwell <sfr@rothwell.id.au> wrote:
>
> Hi Alex,
>
> On Mon, 10 May 2021 10:24:58 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
> >
> > Fixed in this patch set:
> > https://patchwork.freedesktop.org/series/89890/
>
> Sure, but that is not in the amdgpu tree that linux-next includes
> (https://gitlab.freedesktop.org/agd5f/linux#drm-next).  Did you forget
> to push it out, or is it still being reviewed/tested?

Was still being reviewed.  I just pushed out the tree with it included.

Alex

>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-05-10 14:24   ` Alex Deucher
@ 2021-05-10 22:18     ` Stephen Rothwell
  2021-05-10 22:23       ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2021-05-10 22:18 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Stephen Rothwell, Jude Shih, Hanghong Ma, Nicholas Kazlauskas,
	Daniel Wheeler, Linux Kernel Mailing List,
	Linux Next Mailing List, Dave Airlie

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

Hi Alex,

On Mon, 10 May 2021 10:24:58 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> Fixed in this patch set:
> https://patchwork.freedesktop.org/series/89890/

Sure, but that is not in the amdgpu tree that linux-next includes
(https://gitlab.freedesktop.org/agd5f/linux#drm-next).  Did you forget
to push it out, or is it still being reviewed/tested?

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-05-09 22:46 ` Stephen Rothwell
@ 2021-05-10 14:24   ` Alex Deucher
  2021-05-10 22:18     ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2021-05-10 14:24 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jude Shih, Hanghong Ma, Nicholas Kazlauskas, Daniel Wheeler,
	Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie

On Sun, May 9, 2021 at 6:46 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Wed, 5 May 2021 09:34:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the amdgpu 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_initialize_drm_device':
> > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:3728:7: error: implicit declaration of function 'register_outbox_irq_handlers'; did you mean 'register_hpd_handlers'? [-Werror=implicit-function-declaration]
> >  3728 |   if (register_outbox_irq_handlers(dm->adev)) {
> >       |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >       |       register_hpd_handlers
> >
> > Caused by commit
> >
> >   77a49c458931 ("drm/amd/display: Support for DMUB AUX")
> >
> > I have used the amdgpu tree from next-20210504 for today.
>
> This has now been broken for 6 days ... please fix or revert.

Fixed in this patch set:
https://patchwork.freedesktop.org/series/89890/

Alex

>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-05-04 23:34 Stephen Rothwell
@ 2021-05-09 22:46 ` Stephen Rothwell
  2021-05-10 14:24   ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2021-05-09 22:46 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Jude Shih, Hanghong Ma, Nicholas Kazlauskas, Daniel Wheeler,
	Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie

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

Hi all,

On Wed, 5 May 2021 09:34:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu 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_initialize_drm_device':
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:3728:7: error: implicit declaration of function 'register_outbox_irq_handlers'; did you mean 'register_hpd_handlers'? [-Werror=implicit-function-declaration]
>  3728 |   if (register_outbox_irq_handlers(dm->adev)) {
>       |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       |       register_hpd_handlers
> 
> Caused by commit
> 
>   77a49c458931 ("drm/amd/display: Support for DMUB AUX")
> 
> I have used the amdgpu tree from next-20210504 for today.

This has now been broken for 6 days ... please fix or revert.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-05-04 23:34 Stephen Rothwell
  2021-05-09 22:46 ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2021-05-04 23:34 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Jude Shih, Hanghong Ma, Nicholas Kazlauskas, Daniel Wheeler,
	Linux Kernel Mailing List, Linux Next Mailing List, Dave Airlie

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

Hi all,

After merging the amdgpu 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_initialize_drm_device':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:3728:7: error: implicit declaration of function 'register_outbox_irq_handlers'; did you mean 'register_hpd_handlers'? [-Werror=implicit-function-declaration]
 3728 |   if (register_outbox_irq_handlers(dm->adev)) {
      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |       register_hpd_handlers

Caused by commit

  77a49c458931 ("drm/amd/display: Support for DMUB AUX")

I have used the amdgpu tree from next-20210504 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-03-30  2:18 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-03-30  2:18 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Wesley Chalmers, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c: In function 'commit_planes_for_stream':
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:2608:13: error: 'struct pipe_ctx' has no member named 'ttu_regs'
 2608 |     odm_pipe->ttu_regs.min_ttu_vblank = MAX_TTU;
      |             ^~

Caused by commit

  752106f5c5cd ("drm/amd/display: Set max TTU on DPG enable")

CONFIG_DRM_AMD_DC_DCN is not set in this build.

I have used the amdgpu tree from next-20210329 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-03-19  1:21 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-03-19  1:21 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Dillon Varone, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

ERROR: modpost: "dc_dsc_stream_bandwidth_in_kbps" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

Caused by commit

  a03f6c0e26b2 ("drm/amd/display: Add changes for dsc bpp in 16ths and unify bw calculations")

I have used the amdgpu tree from next-20210318 fot today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-02-23  1:11 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-02-23  1:11 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Qingqing Zhuo, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

In file included from include/linux/kernel.h:15,
                 from include/linux/list.h:9,
                 from include/linux/kprobes.h:21,
                 from include/linux/kgdb.h:19,
                 from drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:30,
                 from drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services_types.h:29,
                 from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:29:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'dm_set_vblank':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5465:38: error: 'flags' undeclared (first use in this function)
 5465 |  spin_lock_irqsave(&dm->vblank_lock, flags);
      |                                      ^~~~~
include/linux/typecheck.h:11:9: note: in definition of macro 'typecheck'
   11 |  typeof(x) __dummy2; \
      |         ^
include/linux/spinlock.h:384:2: note: in expansion of macro 'raw_spin_lock_irqsave'
  384 |  raw_spin_lock_irqsave(spinlock_check(lock), flags); \
      |  ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5465:2: note: in expansion of macro 'spin_lock_irqsave'
 5465 |  spin_lock_irqsave(&dm->vblank_lock, flags);
      |  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5465:38: note: each undeclared identifier is reported only once for each function it appears in
 5465 |  spin_lock_irqsave(&dm->vblank_lock, flags);
      |                                      ^~~~~
include/linux/typecheck.h:11:9: note: in definition of macro 'typecheck'
   11 |  typeof(x) __dummy2; \
      |         ^
include/linux/spinlock.h:384:2: note: in expansion of macro 'raw_spin_lock_irqsave'
  384 |  raw_spin_lock_irqsave(spinlock_check(lock), flags); \
      |  ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5465:2: note: in expansion of macro 'spin_lock_irqsave'
 5465 |  spin_lock_irqsave(&dm->vblank_lock, flags);
      |  ^~~~~~~~~~~~~~~~~
include/linux/typecheck.h:12:18: warning: comparison of distinct pointer types lacks a cast
   12 |  (void)(&__dummy == &__dummy2); \
      |                  ^~
include/linux/spinlock.h:251:3: note: in expansion of macro 'typecheck'
  251 |   typecheck(unsigned long, flags); \
      |   ^~~~~~~~~
include/linux/spinlock.h:384:2: note: in expansion of macro 'raw_spin_lock_irqsave'
  384 |  raw_spin_lock_irqsave(spinlock_check(lock), flags); \
      |  ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5465:2: note: in expansion of macro 'spin_lock_irqsave'
 5465 |  spin_lock_irqsave(&dm->vblank_lock, flags);
      |  ^~~~~~~~~~~~~~~~~
In file included from include/linux/rwsem.h:16,
                 from include/linux/notifier.h:15,
                 from include/linux/kprobes.h:22,
                 from include/linux/kgdb.h:19,
                 from drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:30,
                 from drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services_types.h:29,
                 from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:29:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5465:23: error: 'struct amdgpu_display_manager' has no member named 'vblank_lock'
 5465 |  spin_lock_irqsave(&dm->vblank_lock, flags);
      |                       ^~
include/linux/spinlock.h:252:34: note: in definition of macro 'raw_spin_lock_irqsave'
  252 |   flags = _raw_spin_lock_irqsave(lock); \
      |                                  ^~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5465:2: note: in expansion of macro 'spin_lock_irqsave'
 5465 |  spin_lock_irqsave(&dm->vblank_lock, flags);
      |  ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5466:6: error: 'struct amdgpu_display_manager' has no member named 'vblank_workqueue'; did you mean 'hdcp_workqueue'?
 5466 |  dm->vblank_workqueue->dm = dm;
      |      ^~~~~~~~~~~~~~~~
      |      hdcp_workqueue
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5467:6: error: 'struct amdgpu_display_manager' has no member named 'vblank_workqueue'; did you mean 'hdcp_workqueue'?
 5467 |  dm->vblank_workqueue->otg_inst = acrtc->otg_inst;
      |      ^~~~~~~~~~~~~~~~
      |      hdcp_workqueue
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5468:6: error: 'struct amdgpu_display_manager' has no member named 'vblank_workqueue'; did you mean 'hdcp_workqueue'?
 5468 |  dm->vblank_workqueue->enable = enable;
      |      ^~~~~~~~~~~~~~~~
      |      hdcp_workqueue
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5469:28: error: 'struct amdgpu_display_manager' has no member named 'vblank_lock'
 5469 |  spin_unlock_irqrestore(&dm->vblank_lock, flags);
      |                            ^~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5470:21: error: 'struct amdgpu_display_manager' has no member named 'vblank_workqueue'; did you mean 'hdcp_workqueue'?
 5470 |  schedule_work(&dm->vblank_workqueue->mall_work);
      |                     ^~~~~~~~~~~~~~~~
      |                     hdcp_workqueue

Caused by commit

  9d99a805a9a0 ("drm/amd/display: Fix system hang after multiple hotplugs")

I have used the amdgpu tree from next-20210222 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-02-05  2:12 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-02-05  2:12 UTC (permalink / raw)
  To: Alex Deucher, Dave Airlie, DRI
  Cc: Arnd Bergmann, Bhawanpreet Lakha, Linux Kernel Mailing List,
	Linux Next Mailing List

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

Hi all,

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


Caused by commit

  13a75af50484 ("drm/amd/display: Fix unused variable warning")

interacting with commit

  4c3a3292730c ("drm/amd/display: fix unused variable warning")

from the drm tree.

I reverted the drm tree commit for now.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-01-15  8:46   ` Huang, Ray
@ 2021-01-15 14:56     ` Alex Deucher
  0 siblings, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2021-01-15 14:56 UTC (permalink / raw)
  To: Huang, Ray
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List

On Fri, Jan 15, 2021 at 3:46 AM Huang, Ray <Ray.Huang@amd.com> wrote:
>
> [AMD Public Use]
>
> Could you please help to check whether this patch can fix the issue?

Looks good.  Might want to add a comment where you set cpu_core_num
that this is only used on APUs which are x86 only.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

>
> Thanks,
> Ray
>
> -----Original Message-----
> From: Huang, Ray <ray.huang@amd.com>
> Sent: Friday, January 15, 2021 1:57 PM
> To: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Alex Deucher <alexdeucher@gmail.com>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-next@vger.kernel.org>
> Subject: Re: linux-next: build failure after merge of the amdgpu tree
>
> On Fri, Jan 15, 2021 at 01:35:05PM +0800, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_get_smu_metrics_data':
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
>
> Ah, vangogh is an x86 cpu, let me look at this issue.
>
> Could you share me the config file you tested?
>
> Thanks,
> Ray
>
> >   300 |          boot_cpu_data.x86_max_cores * sizeof(uint16_t));
> >       |          ^~~~~~~~~~~~~
> >       |          boot_cpuid
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_read_sensor':
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
> >  1320 |   *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
> >       |           ^~~~~~~~~~~~~
> >       |           boot_cpuid
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_od_edit_dpm_table':
> > drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
> >  1460 |   if (input[0] >= boot_cpu_data.x86_max_cores) {
> >       |                   ^~~~~~~~~~~~~
> >       |                   boot_cpuid
> >
> > Caused by commits
> >
> >   517cb957c43b ("drm/amd/pm: implement the processor clocks which read by metric")
> >   0d90d0ddd10e ("drm/amd/pm: implement processor fine grain feature for vangogh (v3)")
> >
> > The only thing I could do easily is to disable CONFIG_DRM_AMDGPU for today.
> >
> > --
> > Cheers,
> > Stephen Rothwell
>

^ permalink raw reply	[flat|nested] 109+ messages in thread

* RE: linux-next: build failure after merge of the amdgpu tree
  2021-01-15  5:57 ` Huang Rui
@ 2021-01-15  8:46   ` Huang, Ray
  2021-01-15 14:56     ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Huang, Ray @ 2021-01-15  8:46 UTC (permalink / raw)
  To: Huang, Ray, Stephen Rothwell
  Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List

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

[AMD Public Use]

Could you please help to check whether this patch can fix the issue?

Thanks,
Ray

-----Original Message-----
From: Huang, Ray <ray.huang@amd.com> 
Sent: Friday, January 15, 2021 1:57 PM
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alex Deucher <alexdeucher@gmail.com>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the amdgpu tree

On Fri, Jan 15, 2021 at 01:35:05PM +0800, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_get_smu_metrics_data':
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?

Ah, vangogh is an x86 cpu, let me look at this issue.

Could you share me the config file you tested?

Thanks,
Ray

>   300 |          boot_cpu_data.x86_max_cores * sizeof(uint16_t));
>       |          ^~~~~~~~~~~~~
>       |          boot_cpuid
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_read_sensor':
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
>  1320 |   *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
>       |           ^~~~~~~~~~~~~
>       |           boot_cpuid
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_od_edit_dpm_table':
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
>  1460 |   if (input[0] >= boot_cpu_data.x86_max_cores) {
>       |                   ^~~~~~~~~~~~~
>       |                   boot_cpuid
> 
> Caused by commits
> 
>   517cb957c43b ("drm/amd/pm: implement the processor clocks which read by metric")
>   0d90d0ddd10e ("drm/amd/pm: implement processor fine grain feature for vangogh (v3)")
> 
> The only thing I could do easily is to disable CONFIG_DRM_AMDGPU for today.
> 
> -- 
> Cheers,
> Stephen Rothwell


[-- Attachment #2: 0001-drm-amdgpu-fix-build-error-without-x86-kconfig.patch --]
[-- Type: application/octet-stream, Size: 5081 bytes --]

From 33297dbed97ecde2cc9b6d73b8827e37959548fa Mon Sep 17 00:00:00 2001
From: Huang Rui <ray.huang@amd.com>
Date: Fri, 15 Jan 2021 15:59:08 +0800
Subject: [PATCH] drm/amdgpu: fix build error without x86 kconfig

This patch is to fix below build error while we are using the kconfig
without x86.

drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function
'vangogh_get_smu_metrics_data':
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10:
error: 'boot_cpu_data' undeclared (first use in this function); did you
mean 'boot_cpuid'?
  300 |          boot_cpu_data.x86_max_cores * sizeof(uint16_t));
      |          ^~~~~~~~~~~~~
      |          boot_cpuid
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function
'vangogh_read_sensor':
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11:
error: 'boot_cpu_data' undeclared (first use in this function); did you
mean 'boot_cpuid'?
 1320 |   *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
      |           ^~~~~~~~~~~~~
      |           boot_cpuid
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function
'vangogh_od_edit_dpm_table':
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19:
error: 'boot_cpu_data' undeclared (first use in this function); did you
mean 'boot_cpuid'?
 1460 |   if (input[0] >= boot_cpu_data.x86_max_cores) {
      |                   ^~~~~~~~~~~~~
      |                   boot_cpuid

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/amd/pm/amdgpu_pm.c               |  4 ++--
 drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h          |  1 +
 drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 16 +++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_pm.c b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
index 80d6298912aa..e9b569b76716 100644
--- a/drivers/gpu/drm/amd/pm/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_pm.c
@@ -3633,12 +3633,12 @@ static void amdgpu_debugfs_prints_cpu_info(struct seq_file *m,
 	int i;
 
 	if (is_support_cclk_dpm(adev)) {
-		p_val = kcalloc(boot_cpu_data.x86_max_cores, sizeof(uint16_t),
+		p_val = kcalloc(adev->smu.cpu_core_num, sizeof(uint16_t),
 				GFP_KERNEL);
 
 		if (!amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_CPU_CLK,
 					    (void *)p_val, &size)) {
-			for (i = 0; i < boot_cpu_data.x86_max_cores; i++)
+			for (i = 0; i < adev->smu.cpu_core_num; i++)
 				seq_printf(m, "\t%u MHz (CPU%d)\n",
 					   *(p_val + i), i);
 		}
diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
index 25ee9f51813b..fbf88df11a13 100644
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
@@ -471,6 +471,7 @@ struct smu_context
 	uint32_t cpu_actual_soft_min_freq;
 	uint32_t cpu_actual_soft_max_freq;
 	uint32_t cpu_core_id_select;
+	uint16_t cpu_core_num;
 };
 
 struct i2c_adapter;
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
index 2f0cb0ea243b..f127d02c67db 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
@@ -297,7 +297,7 @@ static int vangogh_get_smu_metrics_data(struct smu_context *smu,
 		break;
 	case METRICS_AVERAGE_CPUCLK:
 		memcpy(value, &metrics->CoreFrequency[0],
-		       boot_cpu_data.x86_max_cores * sizeof(uint16_t));
+		       smu->cpu_core_num * sizeof(uint16_t));
 		break;
 	default:
 		*value = UINT_MAX;
@@ -335,6 +335,12 @@ static int vangogh_init_smc_tables(struct smu_context *smu)
 	if (ret)
 		return ret;
 
+#if CONFIG_X86
+	smu->cpu_core_num = boot_cpu_data.x86_max_cores;
+#else
+	smu->cpu_core_num = 4;
+#endif
+
 	return smu_v11_0_init_smc_tables(smu);
 }
 
@@ -1317,7 +1323,7 @@ static int vangogh_read_sensor(struct smu_context *smu,
 		ret = vangogh_get_smu_metrics_data(smu,
 						   METRICS_AVERAGE_CPUCLK,
 						   (uint32_t *)data);
-		*size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
+		*size = smu->cpu_core_num * sizeof(uint16_t);
 		break;
 	default:
 		ret = -EOPNOTSUPP;
@@ -1457,9 +1463,9 @@ static int vangogh_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TAB
 			dev_err(smu->adev->dev, "Input parameter number not correct (should be 4 for processor)\n");
 			return -EINVAL;
 		}
-		if (input[0] >= boot_cpu_data.x86_max_cores) {
+		if (input[0] >= smu->cpu_core_num) {
 			dev_err(smu->adev->dev, "core index is overflow, should be less than %d\n",
-				boot_cpu_data.x86_max_cores);
+				smu->cpu_core_num);
 		}
 		smu->cpu_core_id_select = input[0];
 		if (input[1] == 0) {
@@ -1535,7 +1541,7 @@ static int vangogh_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TAB
 				break;
 			}
 
-			for (i = 0; i < boot_cpu_data.x86_max_cores; i++) {
+			for (i = 0; i < smu->cpu_core_num; i++) {
 				ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetSoftMinCclk,
 								      (i << 20) | smu->cpu_actual_soft_min_freq,
 								      NULL);
-- 
2.25.1


^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2021-01-15  5:35 Stephen Rothwell
@ 2021-01-15  5:57 ` Huang Rui
  2021-01-15  8:46   ` Huang, Ray
  0 siblings, 1 reply; 109+ messages in thread
From: Huang Rui @ 2021-01-15  5:57 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Linux Kernel Mailing List, Linux Next Mailing List

On Fri, Jan 15, 2021 at 01:35:05PM +0800, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_get_smu_metrics_data':
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?

Ah, vangogh is an x86 cpu, let me look at this issue.

Could you share me the config file you tested?

Thanks,
Ray

>   300 |          boot_cpu_data.x86_max_cores * sizeof(uint16_t));
>       |          ^~~~~~~~~~~~~
>       |          boot_cpuid
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_read_sensor':
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
>  1320 |   *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
>       |           ^~~~~~~~~~~~~
>       |           boot_cpuid
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_od_edit_dpm_table':
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
>  1460 |   if (input[0] >= boot_cpu_data.x86_max_cores) {
>       |                   ^~~~~~~~~~~~~
>       |                   boot_cpuid
> 
> Caused by commits
> 
>   517cb957c43b ("drm/amd/pm: implement the processor clocks which read by metric")
>   0d90d0ddd10e ("drm/amd/pm: implement processor fine grain feature for vangogh (v3)")
> 
> The only thing I could do easily is to disable CONFIG_DRM_AMDGPU for today.
> 
> -- 
> Cheers,
> Stephen Rothwell



^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-01-15  5:35 Stephen Rothwell
  2021-01-15  5:57 ` Huang Rui
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2021-01-15  5:35 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Huang Rui, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_get_smu_metrics_data':
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:300:10: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
  300 |          boot_cpu_data.x86_max_cores * sizeof(uint16_t));
      |          ^~~~~~~~~~~~~
      |          boot_cpuid
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_read_sensor':
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1320:11: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
 1320 |   *size = boot_cpu_data.x86_max_cores * sizeof(uint16_t);
      |           ^~~~~~~~~~~~~
      |           boot_cpuid
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c: In function 'vangogh_od_edit_dpm_table':
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu11/vangogh_ppt.c:1460:19: error: 'boot_cpu_data' undeclared (first use in this function); did you mean 'boot_cpuid'?
 1460 |   if (input[0] >= boot_cpu_data.x86_max_cores) {
      |                   ^~~~~~~~~~~~~
      |                   boot_cpuid

Caused by commits

  517cb957c43b ("drm/amd/pm: implement the processor clocks which read by metric")
  0d90d0ddd10e ("drm/amd/pm: implement processor fine grain feature for vangogh (v3)")

The only thing I could do easily is to disable CONFIG_DRM_AMDGPU for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2021-01-08  1:17 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2021-01-08  1:17 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Bhawanpreet Lakha, Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

After merging the amdgpu 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 'dm_set_vblank':
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5493:2: error: implicit declaration of function 'dc_allow_idle_optimizations' [-Werror=implicit-function-declaration]
 5493 |  dc_allow_idle_optimizations(
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  71338cb4a7c2 ("drm/amd/display: enable idle optimizations for linux (MALL stutter)")

I have used the amdgpu tree from next-20210107 for today.
dc_allow_idle_optimizations() is only declared when CONFIG_DRM_AMD_DC_DCN
is set.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2020-10-27  1:08 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2020-10-27  1:08 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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


Presumably caused by commit

  c03c025c87f2 ("drm/amdgpu: fold CONFIG_DRM_AMD_DC_DCN3* into CONFIG_DRM_AMD_DC_DCN")

I have used the amdgpu tree from next-20201026 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2020-06-12  0:25 Stephen Rothwell
@ 2020-06-26  1:47 ` Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2020-06-26  1:47 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Mukul Joshi,
	Christoph Hellwig, Andrew Morton, Dave Airlie, DRI

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

Hi all,

On Fri, 12 Jun 2020 10:25:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c: In function 'kfd_sdma_activity_worker':
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:118:2: error: implicit declaration of function 'use_mm' [-Werror=implicit-function-declaration]
>   118 |  use_mm(mm);
>       |  ^~~~~~
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:145:2: error: implicit declaration of function 'unuse_mm' [-Werror=implicit-function-declaration]
>   145 |  unuse_mm(mm);
>       |  ^~~~~~~~
> 
> Caused by commit
> 
>   32cb59f31362 ("drm/amdkfd: Track SDMA utilization per process")
> 
> interacting with commit
> 
>   f5678e7f2ac3 ("kernel: better document the use_mm/unuse_mm API contract")
> 
> from Linus' tree.
> 
> I have applied the following merge fix for today (that was previously
> part of the akpm tree).

The merge fix patch now looks like:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 May 2020 20:15:34 +1000
Subject: [PATCH] drm/amdkfd: fix up for {un}use_mm() rename

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

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 013c2b018edc..40695d52e9a8 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -184,7 +184,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
 	if (!mm)
 		goto cleanup;
 
-	use_mm(mm);
+	kthread_use_mm(mm);
 
 	list_for_each_entry(sdma_q, &sdma_q_list.list, list) {
 		val = 0;
@@ -198,7 +198,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
 		}
 	}
 
-	unuse_mm(mm);
+	kthread_unuse_mm(mm);
 	mmput(mm);
 
 	/*

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2020-06-17  0:26 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2020-06-17  0:26 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Lewis Huang,
	Aric Cyr, Qingqing Zhuo

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

Hi all,

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

ERROR: modpost: "mod_color_is_table_init" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost: "mod_color_get_table" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: modpost: "mod_color_set_table_init_state" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

Caused by commit

  4a9025f397c6 ("drm/amd/display: change global buffer to local buffer")

I have used the amdgpu tree from next-20200616 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2020-06-12  0:25 Stephen Rothwell
  2020-06-26  1:47 ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2020-06-12  0:25 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Mukul Joshi,
	Christoph Hellwig, Andrew Morton

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c: In function 'kfd_sdma_activity_worker':
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:118:2: error: implicit declaration of function 'use_mm' [-Werror=implicit-function-declaration]
  118 |  use_mm(mm);
      |  ^~~~~~
drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:145:2: error: implicit declaration of function 'unuse_mm' [-Werror=implicit-function-declaration]
  145 |  unuse_mm(mm);
      |  ^~~~~~~~

Caused by commit

  32cb59f31362 ("drm/amdkfd: Track SDMA utilization per process")

interacting with commit

  f5678e7f2ac3 ("kernel: better document the use_mm/unuse_mm API contract")

from Linus' tree.

I have applied the following merge fix for today (that was previously
part of the akpm tree).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 May 2020 20:15:34 +1000
Subject: [PATCH] drm/amdkfd: fix up for {un}use_mm() rename

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

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index db010c5da144..25636789f3d3 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -114,7 +114,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
 		return;
 	}
 
-	use_mm(mm);
+	kthread_use_mm(mm);
 
 	dqm_lock(dqm);
 
@@ -141,7 +141,7 @@ static void kfd_sdma_activity_worker(struct work_struct *work)
 	}
 
 	dqm_unlock(dqm);
-	unuse_mm(mm);
+	kthread_unuse_mm(mm);
 	mmput(mm);
 }
 
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2020-02-11 22:48 Stephen Rothwell
@ 2020-02-12 16:14 ` Rodrigo Siqueira
  0 siblings, 0 replies; 109+ messages in thread
From: Rodrigo Siqueira @ 2020-02-12 16:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Alex Deucher, Linux Next Mailing List, Linux Kernel Mailing List,
	Dmytro Laktyushkin, Eric Yang, Michael Strauss, Wentland, Harry,
	Lakha, Bhawanpreet, Li, Sun peng (Leo)

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

Hi Stephen,

First of all, thanks for your report

On 02/12, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "get_num_odm_splits" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
> 
> Presumably caused by commit
> 
>   5bf24270d1cc ("drm/amd/display: add odm split logic to scaling calculations")

Today I managed to reproduce the issue with 'make allmodconfig', now I'm
trying to understand why my .config file did not trigger this issue.  At
first glance looks like 'make allmodconfig' does not add
'CONFIG_DRM_AMD_DC_DCN=y' as a result files under
'drivers/gpu/drm/amd/display/dc/' directory does not get compiled which
includes the file that defines 'get_num_odm_splits'. I'm still looking
at it... 

Thanks
 
> I used the amdgpu tree from next-20200211 for today.
> 
> -- 
> Cheers,
> Stephen Rothwell



-- 
Rodrigo Siqueira
Software Engineer, Advanced Micro Devices (AMD)
https://siqueira.tech

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2020-02-11 22:48 Stephen Rothwell
  2020-02-12 16:14 ` Rodrigo Siqueira
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2020-02-11 22:48 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Dmytro Laktyushkin, Eric Yang, Michael Strauss, Rodrigo Siqueira

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

Hi all,

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

ERROR: "get_num_odm_splits" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

Presumably caused by commit

  5bf24270d1cc ("drm/amd/display: add odm split logic to scaling calculations")

I used the amdgpu tree from next-20200211 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2020-01-28  4:42 Stephen Rothwell
@ 2020-01-28 21:18 ` Alex Deucher
  0 siblings, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2020-01-28 21:18 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Tianci.Yin

On Mon, Jan 27, 2020 at 11:42 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c: In function 'psp_v11_0_memory_training':
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1047:9: error: implicit declaration of function 'vmalloc'; did you mean 'kvmalloc'? [-Werror=implicit-function-declaration]
>  1047 |   buf = vmalloc(sz);
>       |         ^~~~~~~
>       |         kvmalloc
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1047:7: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
>  1047 |   buf = vmalloc(sz);
>       |       ^
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1057:4: error: implicit declaration of function 'vfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
>  1057 |    vfree(buf);
>       |    ^~~~~
>       |    kvfree
>
> Caused by commit
>
>   240c811ccde4 ("drm/amdgpu: fix VRAM partially encroached issue in GDDR6 memory training(V2)")
>
> I have applied this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 28 Jan 2020 15:33:44 +1100
> Subject: [PATCH] amdgpu: using vmalloc requires includeing vmalloc.h
>
> Fixes: 240c811ccde4 ("drm/amdgpu: fix VRAM partially encroached issue in GDDR6 memory training(V2)")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied.  thanks!

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index ac173d2eb809..0829188c1a5c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -22,6 +22,7 @@
>
>  #include <linux/firmware.h>
>  #include <linux/module.h>
> +#include <linux/vmalloc.h>
>
>  #include "amdgpu.h"
>  #include "amdgpu_psp.h"
> --
> 2.24.1
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2020-01-28  4:42 Stephen Rothwell
  2020-01-28 21:18 ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2020-01-28  4:42 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Tianci.Yin

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/psp_v11_0.c: In function 'psp_v11_0_memory_training':
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1047:9: error: implicit declaration of function 'vmalloc'; did you mean 'kvmalloc'? [-Werror=implicit-function-declaration]
 1047 |   buf = vmalloc(sz);
      |         ^~~~~~~
      |         kvmalloc
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1047:7: warning: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
 1047 |   buf = vmalloc(sz);
      |       ^
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c:1057:4: error: implicit declaration of function 'vfree'; did you mean 'kvfree'? [-Werror=implicit-function-declaration]
 1057 |    vfree(buf);
      |    ^~~~~
      |    kvfree

Caused by commit

  240c811ccde4 ("drm/amdgpu: fix VRAM partially encroached issue in GDDR6 memory training(V2)")

I have applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 28 Jan 2020 15:33:44 +1100
Subject: [PATCH] amdgpu: using vmalloc requires includeing vmalloc.h

Fixes: 240c811ccde4 ("drm/amdgpu: fix VRAM partially encroached issue in GDDR6 memory training(V2)")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index ac173d2eb809..0829188c1a5c 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -22,6 +22,7 @@
 
 #include <linux/firmware.h>
 #include <linux/module.h>
+#include <linux/vmalloc.h>
 
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
-- 
2.24.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2020-01-08  2:18 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2020-01-08  2:18 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, David Francis

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

Hi all,

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

ERROR: "dcn20_add_dsc_to_stream_resource" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "dc_dsc_parse_dsc_dpcd" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "dc_dsc_get_policy_for_timing" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "dc_dsc_compute_bandwidth_range" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "dc_dsc_compute_config" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

I am not sure what caused this.

I have used the amdgpu tree from next-20200107 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-11-08  5:31 Stephen Rothwell
  2019-11-08 15:50 ` Grodzovsky, Andrey
@ 2019-11-08 15:59 ` Alex Deucher
  1 sibling, 0 replies; 109+ messages in thread
From: Alex Deucher @ 2019-11-08 15:59 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Andrey Grodzovsky, Christian König

On Fri, Nov 8, 2019 at 12:31 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from <command-line>:
> include/drm/gpu_scheduler.h:98:21: error: field 'entity_idle' has incomplete type
>    98 |  struct completion  entity_idle;
>       |                     ^~~~~~~~~~~
>
> followed by lots of similar errors.
>
> Caused by commit
>
>   83a7772ba223 ("drm/sched: Use completion to wait for sched->thread idle v2.")
>
> I added the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 8 Nov 2019 16:21:32 +1100
> Subject: [PATCH] drm/sched: struct completion requires linux/completion.h
>  inclusion
>
> Fixes: 83a7772ba223 ("drm/sched: Use completion to wait for sched->thread idle v2.")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied.  Thanks!

Alex

> ---
>  include/drm/gpu_scheduler.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
> index 6619d2ac6fa3..684692a8ed76 100644
> --- a/include/drm/gpu_scheduler.h
> +++ b/include/drm/gpu_scheduler.h
> @@ -26,6 +26,7 @@
>
>  #include <drm/spsc_queue.h>
>  #include <linux/dma-fence.h>
> +#include <linux/completion.h>
>
>  #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000)
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-11-08  5:31 Stephen Rothwell
@ 2019-11-08 15:50 ` Grodzovsky, Andrey
  2019-11-08 15:59 ` Alex Deucher
  1 sibling, 0 replies; 109+ messages in thread
From: Grodzovsky, Andrey @ 2019-11-08 15:50 UTC (permalink / raw)
  To: Stephen Rothwell, Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Koenig, Christian

Thanks for taking care of this. Oddly, i don't get compile error on this.

Andrey

On 11/8/19 12:31 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from <command-line>:
> include/drm/gpu_scheduler.h:98:21: error: field 'entity_idle' has incomplete type
>     98 |  struct completion  entity_idle;
>        |                     ^~~~~~~~~~~
>
> followed by lots of similar errors.
>
> Caused by commit
>
>    83a7772ba223 ("drm/sched: Use completion to wait for sched->thread idle v2.")
>
> I added the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 8 Nov 2019 16:21:32 +1100
> Subject: [PATCH] drm/sched: struct completion requires linux/completion.h
>   inclusion
>
> Fixes: 83a7772ba223 ("drm/sched: Use completion to wait for sched->thread idle v2.")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   include/drm/gpu_scheduler.h | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
> index 6619d2ac6fa3..684692a8ed76 100644
> --- a/include/drm/gpu_scheduler.h
> +++ b/include/drm/gpu_scheduler.h
> @@ -26,6 +26,7 @@
>   
>   #include <drm/spsc_queue.h>
>   #include <linux/dma-fence.h>
> +#include <linux/completion.h>
>   
>   #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000)
>   

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2019-11-08  5:31 Stephen Rothwell
  2019-11-08 15:50 ` Grodzovsky, Andrey
  2019-11-08 15:59 ` Alex Deucher
  0 siblings, 2 replies; 109+ messages in thread
From: Stephen Rothwell @ 2019-11-08  5:31 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Andrey Grodzovsky, Christian König

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

Hi all,

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

In file included from <command-line>:
include/drm/gpu_scheduler.h:98:21: error: field 'entity_idle' has incomplete type
   98 |  struct completion  entity_idle;
      |                     ^~~~~~~~~~~

followed by lots of similar errors.

Caused by commit

  83a7772ba223 ("drm/sched: Use completion to wait for sched->thread idle v2.")

I added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Nov 2019 16:21:32 +1100
Subject: [PATCH] drm/sched: struct completion requires linux/completion.h
 inclusion

Fixes: 83a7772ba223 ("drm/sched: Use completion to wait for sched->thread idle v2.")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/drm/gpu_scheduler.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index 6619d2ac6fa3..684692a8ed76 100644
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -26,6 +26,7 @@
 
 #include <drm/spsc_queue.h>
 #include <linux/dma-fence.h>
+#include <linux/completion.h>
 
 #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000)
 
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2019-11-07  0:46 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2019-11-07  0:46 UTC (permalink / raw)
  To: Alex Deucher; +Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

ERROR: "dc_dsc_parse_dsc_dpcd" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "dc_dsc_compute_config" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

I am not sure what caused this, but CONFIG_DRM_AMD_DC_DCN is not set
for this build.

I have used the amdgpu tree from next-20191106 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-08-16  1:52       ` Alex Deucher
@ 2019-08-16  2:43         ` Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2019-08-16  2:43 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Huang, Ray, Linux Next Mailing List, Linux Kernel Mailing List,
	Liu, Aaron

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

Hi Alex,

On Thu, 15 Aug 2019 21:52:19 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> Yes, sorry, just pushed out now.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-08-16  0:21     ` Stephen Rothwell
@ 2019-08-16  1:52       ` Alex Deucher
  2019-08-16  2:43         ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2019-08-16  1:52 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Huang, Ray, Linux Next Mailing List, Linux Kernel Mailing List,
	Liu, Aaron

Yes, sorry, just pushed out now.

Alex

On Thu, Aug 15, 2019 at 8:21 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Alex,
>
> On Tue, 13 Aug 2019 10:01:07 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
> >
> > Applied.  thanks!
>
> But not pushed out?
>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-08-13 14:01   ` Alex Deucher
@ 2019-08-16  0:21     ` Stephen Rothwell
  2019-08-16  1:52       ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2019-08-16  0:21 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Huang, Ray, Linux Next Mailing List, Linux Kernel Mailing List,
	Liu, Aaron

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

Hi Alex,

On Tue, 13 Aug 2019 10:01:07 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> Applied.  thanks!

But not pushed out?

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-08-13  8:21 ` Huang, Ray
@ 2019-08-13 14:01   ` Alex Deucher
  2019-08-16  0:21     ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2019-08-13 14:01 UTC (permalink / raw)
  To: Huang, Ray
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Liu, Aaron

On Tue, Aug 13, 2019 at 4:21 AM Huang, Ray <Ray.Huang@amd.com> wrote:
>
> > -----Original Message-----
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Sent: Tuesday, August 13, 2019 4:11 PM
> > To: Alex Deucher <alexdeucher@gmail.com>
> > Cc: Linux Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel
> > Mailing List <linux-kernel@vger.kernel.org>; Liu, Aaron
> > <Aaron.Liu@amd.com>; Huang, Ray <Ray.Huang@amd.com>
> > Subject: linux-next: build failure after merge of the amdgpu tree
> >
> > Hi all,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/gpu/drm/amd/amdgpu/psp_v12_0.c:39:17: error: expected
> > declaration specifiers or '...' before string constant
> > MODULE_FIRMWARE("amdgpu/renoir_asd.bin");
> >                  ^~~~~~~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> >   6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")
> >
> > I have applied the following patch for today:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 13 Aug 2019 18:03:16 +1000
> > Subject: [PATCH] drm/amdgpu: MODULE_FIRMWARE requires
> > linux/module.h
> >
> > Fixes: 6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Thanks!
>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
>

Applied.  thanks!

Alex

> > ---
> >  drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> > b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> > index f37b8af4b986..b474dfb79375 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> > @@ -21,6 +21,7 @@
> >   */
> >
> >  #include <linux/firmware.h>
> > +#include <linux/module.h>
> >  #include "amdgpu.h"
> >  #include "amdgpu_psp.h"
> >  #include "amdgpu_ucode.h"
> > --
> > 2.20.1
> >
> > --
> > Cheers,
> > Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* RE: linux-next: build failure after merge of the amdgpu tree
  2019-08-13  8:10 Stephen Rothwell
@ 2019-08-13  8:21 ` Huang, Ray
  2019-08-13 14:01   ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Huang, Ray @ 2019-08-13  8:21 UTC (permalink / raw)
  To: Stephen Rothwell, Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Liu, Aaron

> -----Original Message-----
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Sent: Tuesday, August 13, 2019 4:11 PM
> To: Alex Deucher <alexdeucher@gmail.com>
> Cc: Linux Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel
> Mailing List <linux-kernel@vger.kernel.org>; Liu, Aaron
> <Aaron.Liu@amd.com>; Huang, Ray <Ray.Huang@amd.com>
> Subject: linux-next: build failure after merge of the amdgpu tree
> 
> Hi all,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/psp_v12_0.c:39:17: error: expected
> declaration specifiers or '...' before string constant
> MODULE_FIRMWARE("amdgpu/renoir_asd.bin");
>                  ^~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")
> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 13 Aug 2019 18:03:16 +1000
> Subject: [PATCH] drm/amdgpu: MODULE_FIRMWARE requires
> linux/module.h
> 
> Fixes: 6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks!

Reviewed-by: Huang Rui <ray.huang@amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> index f37b8af4b986..b474dfb79375 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> @@ -21,6 +21,7 @@
>   */
> 
>  #include <linux/firmware.h>
> +#include <linux/module.h>
>  #include "amdgpu.h"
>  #include "amdgpu_psp.h"
>  #include "amdgpu_ucode.h"
> --
> 2.20.1
> 
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2019-08-13  8:10 Stephen Rothwell
  2019-08-13  8:21 ` Huang, Ray
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2019-08-13  8:10 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Aaron Liu, Huang Rui

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

Hi all,

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

drivers/gpu/drm/amd/amdgpu/psp_v12_0.c:39:17: error: expected declaration specifiers or '...' before string constant
 MODULE_FIRMWARE("amdgpu/renoir_asd.bin");
                 ^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Aug 2019 18:03:16 +1000
Subject: [PATCH] drm/amdgpu: MODULE_FIRMWARE requires linux/module.h

Fixes: 6a7a0bdbfa0c ("drm/amdgpu: add psp_v12_0 for renoir (v2)")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
index f37b8af4b986..b474dfb79375 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
@@ -21,6 +21,7 @@
  */
 
 #include <linux/firmware.h>
+#include <linux/module.h>
 #include "amdgpu.h"
 #include "amdgpu_psp.h"
 #include "amdgpu_ucode.h"
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-06-27 14:18   ` Alex Deucher
@ 2019-06-27 22:01     ` Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2019-06-27 22:01 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Dave Airlie, Linux Next Mailing List, Linux Kernel Mailing List,
	Hawking Zhang, Huang Rui, DRI

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

Hi Alex,

On Thu, 27 Jun 2019 10:18:38 -0400 Alex Deucher <alexdeucher@gmail.com> wrote:
>
> Fixed in this patch:
> https://patchwork.freedesktop.org/patch/314527/?series=62866&rev=1

Thanks.  I will manually apply that to the drm tree merge until it is
no longer necessary there.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-06-27  3:35 ` Stephen Rothwell
@ 2019-06-27 14:18   ` Alex Deucher
  2019-06-27 22:01     ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Alex Deucher @ 2019-06-27 14:18 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Dave Airlie, Linux Next Mailing List, Linux Kernel Mailing List,
	Hawking Zhang, Huang Rui, DRI

On Wed, Jun 26, 2019 at 11:35 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Dave,
>
> On Wed, 26 Jun 2019 21:22:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi Alex,
> >
> > After merging the amdgpu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > In file included from drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:25:
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c: In function 'gfx_v10_0_cp_gfx_resume':
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_RB_CNTL__BUF_SWAP_MASK'?
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >                            ^~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
> >  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
> >                                     ^~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >         ^~~~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: note: each undeclared identifier is reported only once for each function it appears in
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >                            ^~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
> >  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
> >                                     ^~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >         ^~~~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_RB0_CNTL__BUF_SWAP__SHIFT'?
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >                            ^~~~~~~~~~~
> > drivers/gpu/drm/amd/amdgpu/amdgpu.h:1066:37: note: in definition of macro 'REG_FIELD_SHIFT'
> >  #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
> >                                      ^~~
> > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
> >   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
> >         ^~~~~~~~~~~~~
> >
> > Caused by commit
> >
> >   a644d85a5cd4 ("drm/amdgpu: add gfx v10 implementation (v10)")
> >
> > I have disabled that driver for today.  Please let me know when it is
> > fixed so that I can enable it again.
>
> I assume that this has now been inherited by the drm tree (since there
> has been no fix).  So the AMD_GPU driver will still be disabled in
> linux-next today as of the drm tree merge.

Fixed in this patch:
https://patchwork.freedesktop.org/patch/314527/?series=62866&rev=1

Alex

>
> --
> Cheers,
> Stephen Rothwell

^ permalink raw reply	[flat|nested] 109+ messages in thread

* Re: linux-next: build failure after merge of the amdgpu tree
  2019-06-26 11:22 Stephen Rothwell
@ 2019-06-27  3:35 ` Stephen Rothwell
  2019-06-27 14:18   ` Alex Deucher
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2019-06-27  3:35 UTC (permalink / raw)
  To: Dave Airlie
  Cc: Alex Deucher, Linux Next Mailing List, Linux Kernel Mailing List,
	Hawking Zhang, Huang Rui, DRI

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

Hi Dave,

On Wed, 26 Jun 2019 21:22:12 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Alex,
> 
> After merging the amdgpu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:25:
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c: In function 'gfx_v10_0_cp_gfx_resume':
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_RB_CNTL__BUF_SWAP_MASK'?
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>                            ^~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
>  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
>                                     ^~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>         ^~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: note: each undeclared identifier is reported only once for each function it appears in
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>                            ^~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
>  #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
>                                     ^~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>         ^~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_RB0_CNTL__BUF_SWAP__SHIFT'?
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>                            ^~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/amdgpu.h:1066:37: note: in definition of macro 'REG_FIELD_SHIFT'
>  #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
>                                      ^~~
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
>   tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
>         ^~~~~~~~~~~~~
> 
> Caused by commit
> 
>   a644d85a5cd4 ("drm/amdgpu: add gfx v10 implementation (v10)")
> 
> I have disabled that driver for today.  Please let me know when it is
> fixed so that I can enable it again.

I assume that this has now been inherited by the drm tree (since there
has been no fix).  So the AMD_GPU driver will still be disabled in
linux-next today as of the drm tree merge.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2019-06-26 11:22 Stephen Rothwell
  2019-06-27  3:35 ` Stephen Rothwell
  0 siblings, 1 reply; 109+ messages in thread
From: Stephen Rothwell @ 2019-06-26 11:22 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Hawking Zhang, Huang Rui

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

Hi Alex,

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

In file included from drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:25:
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c: In function 'gfx_v10_0_cp_gfx_resume':
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP_MASK' undeclared (first use in this function); did you mean 'CP_RB_CNTL__BUF_SWAP_MASK'?
  tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
                           ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
 #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
                                    ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
  tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
        ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: note: each undeclared identifier is reported only once for each function it appears in
  tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
                           ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1067:36: note: in definition of macro 'REG_FIELD_MASK'
 #define REG_FIELD_MASK(reg, field) reg##__##field##_MASK
                                    ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
  tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
        ^~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:27: error: 'CP_RB1_CNTL__BUF_SWAP__SHIFT' undeclared (first use in this function); did you mean 'CP_RB0_CNTL__BUF_SWAP__SHIFT'?
  tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
                           ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu.h:1066:37: note: in definition of macro 'REG_FIELD_SHIFT'
 #define REG_FIELD_SHIFT(reg, field) reg##__##field##__SHIFT
                                     ^~~
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c:2628:8: note: in expansion of macro 'REG_SET_FIELD'
  tmp = REG_SET_FIELD(tmp, CP_RB1_CNTL, BUF_SWAP, 1);
        ^~~~~~~~~~~~~

Caused by commit

  a644d85a5cd4 ("drm/amdgpu: add gfx v10 implementation (v10)")

I have disabled that driver for today.  Please let me know when it is
fixed so that I can enable it again.
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2019-06-24  4:24 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2019-06-24  4:24 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Kevin Wang,
	Huang Rui

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

Hi Alex,

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

In file included from include/linux/kernel.h:15,
                 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/firmware.h:7,
                 from drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:23:
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c: In function 'smu_v11_0_irq_process':
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1542:5: error: implicit declaration of function 'PCI_BUS_NUM' [-Werror=implicit-function-declaration]
     PCI_BUS_NUM(adev->pdev->devfn),
     ^~~~~~~~~~~
include/linux/printk.h:306:37: note: in definition of macro 'pr_warning'
  printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
                                     ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1541:4: note: in expansion of macro 'pr_warn'
    pr_warn("GPU over temperature range detected on PCIe %d:%d.%d!\n",
    ^~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1542:27: error: dereferencing pointer to incomplete type 'struct pci_dev'
     PCI_BUS_NUM(adev->pdev->devfn),
                           ^~
include/linux/printk.h:306:37: note: in definition of macro 'pr_warning'
  printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
                                     ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1541:4: note: in expansion of macro 'pr_warn'
    pr_warn("GPU over temperature range detected on PCIe %d:%d.%d!\n",
    ^~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1543:5: error: implicit declaration of function 'PCI_SLOT'; did you mean 'CC_SET'? [-Werror=implicit-function-declaration]
     PCI_SLOT(adev->pdev->devfn),
     ^~~~~~~~
include/linux/printk.h:306:37: note: in definition of macro 'pr_warning'
  printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
                                     ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1541:4: note: in expansion of macro 'pr_warn'
    pr_warn("GPU over temperature range detected on PCIe %d:%d.%d!\n",
    ^~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1544:5: error: implicit declaration of function 'PCI_FUNC'; did you mean 'STT_FUNC'? [-Werror=implicit-function-declaration]
     PCI_FUNC(adev->pdev->devfn));
     ^~~~~~~~
include/linux/printk.h:306:37: note: in definition of macro 'pr_warning'
  printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
                                     ^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1541:4: note: in expansion of macro 'pr_warn'
    pr_warn("GPU over temperature range detected on PCIe %d:%d.%d!\n",
    ^~~~~~~
cc1: some warnings being treated as errors

Caused by commit

  5e6d266573db ("drm/amd/powerplay: add thermal ctf support for navi10")

I have used the amdgu tree from next-20190621 for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

* linux-next: build failure after merge of the amdgpu tree
@ 2019-03-19  0:04 Stephen Rothwell
  0 siblings, 0 replies; 109+ messages in thread
From: Stephen Rothwell @ 2019-03-19  0:04 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	David Francis, Harry Wentland, Leo Li, Nicholas Kazlauskas

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

Hi all,

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


ERROR: "get_vupdate_offset_from_vsync" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!

Caused by commit

  67b112ed997b ("drm/amd/display: On DCN1, Wait for vupdate on cursor updates")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 109+ messages in thread

end of thread, other threads:[~2022-07-27 16:27 UTC | newest]

Thread overview: 109+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-28 12:34 linux-next: build failure after merge of the amdgpu tree Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2022-07-25 11:16 Stephen Rothwell
2022-07-27 16:21 ` Rodrigo Siqueira Jordao
2022-07-27 16:23   ` Alex Deucher
2022-07-19  2:36 Stephen Rothwell
2022-07-20  2:47 ` Stephen Rothwell
2022-07-21  2:16   ` Stephen Rothwell
2022-07-22  2:52     ` Stephen Rothwell
2022-07-22 13:30       ` Alex Deucher
2022-06-23  6:07 Stephen Rothwell
2022-06-23 11:01 ` Greg KH
2022-06-27 14:40 ` Greg KH
2022-06-15  4:37 Stephen Rothwell
2022-06-15 18:17 ` Alex Deucher
2022-06-14  4:51 Stephen Rothwell
2022-06-03  4:43 Stephen Rothwell
2022-06-09  3:14 ` Stephen Rothwell
2022-06-15  5:00 ` Stephen Rothwell
2022-06-21  8:15   ` Stephen Rothwell
2022-06-21 15:02     ` Alex Deucher
2022-06-21 22:07       ` Stephen Rothwell
2022-06-22 14:48         ` Alex Deucher
2022-06-23  7:47           ` Stephen Rothwell
2022-06-02  0:30 Stephen Rothwell
2022-05-06  1:06 Stephen Rothwell
2022-05-05  9:47 Stephen Rothwell
2022-05-05 18:12 ` Nathan Chancellor
2022-05-05 18:46   ` Alex Deucher
2022-05-06  1:05     ` Stephen Rothwell
     [not found] <BN9PR12MB5145ECB75120FF9AC1AA4CFB8DEC9@BN9PR12MB5145.namprd12.prod.outlook.com>
2022-04-13 14:18 ` Alex Deucher
     [not found]   ` <BN9PR12MB5145D81F9978B656E9BB67C78DEF9@BN9PR12MB5145.namprd12.prod.outlook.com>
2022-04-14 14:23     ` Rodrigo Siqueira Jordao
2022-04-14 14:27       ` Alex Deucher
2022-04-14 14:31         ` Rodrigo Siqueira Jordao
2022-04-13  2:32 Stephen Rothwell
2022-04-08  4:46 Stephen Rothwell
2022-03-07  0:13 Stephen Rothwell
2022-03-07  7:16 ` Uwe Kleine-König
2022-03-07 13:04 ` Mark Brown
2022-03-08 11:15   ` Noralf Trønnes
2022-02-15  0:57 Stephen Rothwell
2022-02-01  3:32 Stephen Rothwell
2022-02-01 18:32 ` Limonciello, Mario
2022-02-01 18:53   ` Alex Deucher
2022-01-26 23:42 Stephen Rothwell
2022-01-14  0:36 Stephen Rothwell
2022-01-14 23:25 ` Stephen Rothwell
2021-12-03  1:11 Stephen Rothwell
2021-11-18  4:23 Stephen Rothwell
2021-10-08  0:31 Stephen Rothwell
2021-10-08  6:27 ` Simon Ser
2021-10-08  8:29   ` Stephen Rothwell
2021-10-08  9:22     ` Simon Ser
2021-10-08 14:11       ` Alex Deucher
2021-10-08 18:07         ` Simon Ser
2021-10-11  7:33           ` Christoph Hellwig
2021-10-11  7:39             ` Simon Ser
2021-10-11  7:43               ` Christoph Hellwig
2021-10-11  7:49                 ` Simon Ser
2021-10-11  7:51                   ` Christoph Hellwig
2021-10-11  7:57                     ` Simon Ser
2021-10-11  8:01                       ` Christoph Hellwig
2021-10-11  8:21                         ` Simon Ser
2021-10-09  4:57       ` Stephen Rothwell
2021-10-12  2:25 ` Stephen Rothwell
2021-10-12 13:32   ` Alex Deucher
2021-09-29  1:20 Stephen Rothwell
2021-09-17  0:57 Stephen Rothwell
2021-08-02 15:55 linux-next: Build " Mark Brown
2021-05-27  5:58 linux-next: build " Stephen Rothwell
2021-05-04 23:34 Stephen Rothwell
2021-05-09 22:46 ` Stephen Rothwell
2021-05-10 14:24   ` Alex Deucher
2021-05-10 22:18     ` Stephen Rothwell
2021-05-10 22:23       ` Alex Deucher
2021-05-10 23:02         ` Stephen Rothwell
2021-03-30  2:18 Stephen Rothwell
2021-03-19  1:21 Stephen Rothwell
2021-02-23  1:11 Stephen Rothwell
2021-02-05  2:12 Stephen Rothwell
2021-01-15  5:35 Stephen Rothwell
2021-01-15  5:57 ` Huang Rui
2021-01-15  8:46   ` Huang, Ray
2021-01-15 14:56     ` Alex Deucher
2021-01-08  1:17 Stephen Rothwell
2020-10-27  1:08 Stephen Rothwell
2020-06-17  0:26 Stephen Rothwell
2020-06-12  0:25 Stephen Rothwell
2020-06-26  1:47 ` Stephen Rothwell
2020-02-11 22:48 Stephen Rothwell
2020-02-12 16:14 ` Rodrigo Siqueira
2020-01-28  4:42 Stephen Rothwell
2020-01-28 21:18 ` Alex Deucher
2020-01-08  2:18 Stephen Rothwell
2019-11-08  5:31 Stephen Rothwell
2019-11-08 15:50 ` Grodzovsky, Andrey
2019-11-08 15:59 ` Alex Deucher
2019-11-07  0:46 Stephen Rothwell
2019-08-13  8:10 Stephen Rothwell
2019-08-13  8:21 ` Huang, Ray
2019-08-13 14:01   ` Alex Deucher
2019-08-16  0:21     ` Stephen Rothwell
2019-08-16  1:52       ` Alex Deucher
2019-08-16  2:43         ` Stephen Rothwell
2019-06-26 11:22 Stephen Rothwell
2019-06-27  3:35 ` Stephen Rothwell
2019-06-27 14:18   ` Alex Deucher
2019-06-27 22:01     ` Stephen Rothwell
2019-06-24  4:24 Stephen Rothwell
2019-03-19  0:04 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).