linux-next: build failure after merge of the amdgpu tree

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

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

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

[Stephen Rothwell]

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

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

[Alex Deucher]

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

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

[Stephen Rothwell]

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

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

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

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

[Grodzovsky, Andrey]

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

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

[Alex Deucher]

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

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

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

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

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

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

[Huang, Ray]

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

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

[Alex Deucher]

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

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

[Stephen Rothwell]

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

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

[Alex Deucher]

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

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

[Stephen Rothwell]

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

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

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

linux-next: build failure after merge of the amdgpu tree

[Stephen Rothwell]

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