2019-11-08 05:32:10

by Stephen Rothwell

[permalink] [raw]
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:

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


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2019-11-08 15:51:45

by Andrey Grodzovsky

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

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 <[email protected]>
> 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 <[email protected]>
> ---
> 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)
>

2019-11-08 16:01:02

by Alex Deucher

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

On Fri, Nov 8, 2019 at 12:31 AM Stephen Rothwell <[email protected]> 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 <[email protected]>
> 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 <[email protected]>

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