* linux-next: build failure after merge of the drm-misc tree
@ 2021-10-15 9:26 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-10-15 9:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3083 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
111 | static depot_stack_handle_t __stack_depot_save(void)
| ^~~~~~~~~~~~~~~~~~
In file included from include/linux/page_ext.h:7,
from include/linux/mm.h:25,
from include/linux/kallsyms.h:13,
from include/linux/bpf.h:20,
from include/linux/bpf-cgroup.h:5,
from include/linux/cgroup-defs.h:22,
from include/linux/cgroup.h:28,
from include/linux/memcontrol.h:13,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from include/linux/regulator/consumer.h:35,
from include/linux/i2c.h:18,
from include/drm/drm_crtc.h:28,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/drm_modeset_lock.c:24:
include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
| ^~~~~~~~~~~~~~~~~~
Caused by commit
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
This may only have been revealed because of another fix I have had to
apply today.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Oct 2021 20:17:52 +1100
Subject: [PATCH] drm/locking: fix for name conflict
Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 4d32b61fa1fd..ee36dd20900d 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -79,7 +79,7 @@
static DEFINE_WW_CLASS(crtc_ww_class);
#if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
-static noinline depot_stack_handle_t __stack_depot_save(void)
+static noinline depot_stack_handle_t __drm_stack_depot_save(void)
{
unsigned long entries[8];
unsigned int n;
@@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
kfree(buf);
}
#else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
-static depot_stack_handle_t __stack_depot_save(void)
+static depot_stack_handle_t __drm_stack_depot_save(void)
{
return 0;
}
@@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
ret = 0;
} else if (ret == -EDEADLK) {
ctx->contended = lock;
- ctx->stack_depot = __stack_depot_save();
+ ctx->stack_depot = __drm_stack_depot_save();
}
return ret;
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 38+ messages in thread
* [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-10-15 9:26 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-10-15 9:26 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3083 bytes --]
Hi all,
After merging the drm-misc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
111 | static depot_stack_handle_t __stack_depot_save(void)
| ^~~~~~~~~~~~~~~~~~
In file included from include/linux/page_ext.h:7,
from include/linux/mm.h:25,
from include/linux/kallsyms.h:13,
from include/linux/bpf.h:20,
from include/linux/bpf-cgroup.h:5,
from include/linux/cgroup-defs.h:22,
from include/linux/cgroup.h:28,
from include/linux/memcontrol.h:13,
from include/linux/swap.h:9,
from include/linux/suspend.h:5,
from include/linux/regulator/consumer.h:35,
from include/linux/i2c.h:18,
from include/drm/drm_crtc.h:28,
from include/drm/drm_atomic.h:31,
from drivers/gpu/drm/drm_modeset_lock.c:24:
include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
| ^~~~~~~~~~~~~~~~~~
Caused by commit
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
This may only have been revealed because of another fix I have had to
apply today.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Oct 2021 20:17:52 +1100
Subject: [PATCH] drm/locking: fix for name conflict
Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
index 4d32b61fa1fd..ee36dd20900d 100644
--- a/drivers/gpu/drm/drm_modeset_lock.c
+++ b/drivers/gpu/drm/drm_modeset_lock.c
@@ -79,7 +79,7 @@
static DEFINE_WW_CLASS(crtc_ww_class);
#if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
-static noinline depot_stack_handle_t __stack_depot_save(void)
+static noinline depot_stack_handle_t __drm_stack_depot_save(void)
{
unsigned long entries[8];
unsigned int n;
@@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
kfree(buf);
}
#else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
-static depot_stack_handle_t __stack_depot_save(void)
+static depot_stack_handle_t __drm_stack_depot_save(void)
{
return 0;
}
@@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
ret = 0;
} else if (ret == -EDEADLK) {
ctx->contended = lock;
- ctx->stack_depot = __stack_depot_save();
+ ctx->stack_depot = __drm_stack_depot_save();
}
return ret;
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:26 ` [Intel-gfx] " Stephen Rothwell
@ 2021-10-15 9:56 ` Jani Nikula
-1 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-10-15 9:56 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Fri, 15 Oct 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~~~~~~~~~~~~~~~~~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
My bad, what was I thinking using stack depot's "namespace".
The fix looks good, but I'd rename __stack_depot_print too added in the
same commit. Do you want to respin or shall I take it from here?
Thanks,
Jani.
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-10-15 9:56 ` Jani Nikula
0 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-10-15 9:56 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI
Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Fri, 15 Oct 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~~~~~~~~~~~~~~~~~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
My bad, what was I thinking using stack depot's "namespace".
The fix looks good, but I'd rename __stack_depot_print too added in the
same commit. Do you want to respin or shall I take it from here?
Thanks,
Jani.
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:56 ` [Intel-gfx] " Jani Nikula
@ 2021-10-15 10:23 ` Stephen Rothwell
-1 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-10-15 10:23 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
Hi Jani,
On Fri, 15 Oct 2021 12:56:58 +0300 Jani Nikula <jani.nikula@intel.com> wrote:
>
> The fix looks good, but I'd rename __stack_depot_print too added in the
> same commit. Do you want to respin or shall I take it from here?
If you are happy to take it on, then thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-10-15 10:23 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-10-15 10:23 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Daniel Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
Hi Jani,
On Fri, 15 Oct 2021 12:56:58 +0300 Jani Nikula <jani.nikula@intel.com> wrote:
>
> The fix looks good, but I'd rename __stack_depot_print too added in the
> same commit. Do you want to respin or shall I take it from here?
If you are happy to take it on, then thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:26 ` [Intel-gfx] " Stephen Rothwell
(?)
(?)
@ 2021-10-15 12:01 ` Patchwork
-1 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2021-10-15 12:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/95874/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
de0f37d0d3e1 linux-next: build failure after merge of the drm-misc tree
-:35: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#35:
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
-:35: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")'
#35:
cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
total: 1 errors, 1 warnings, 0 checks, 24 lines checked
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:26 ` [Intel-gfx] " Stephen Rothwell
` (2 preceding siblings ...)
(?)
@ 2021-10-15 12:30 ` Patchwork
-1 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2021-10-15 12:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 4677 bytes --]
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/95874/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10743 -> Patchwork_21351
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/index.html
Known issues
------------
Here are the changes found in Patchwork_21351 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][1] ([fdo#109271]) +27 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-bdw-5557u/igt@amdgpu/amd_basic@semaphore.html
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][2] -> [INCOMPLETE][3] ([i915#3921])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
* igt@kms_chamelium@dp-crc-fast:
- fi-bdw-5557u: NOTRUN -> [SKIP][4] ([fdo#109271] / [fdo#111827]) +8 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-bdw-5557u/igt@kms_chamelium@dp-crc-fast.html
* igt@prime_vgem@basic-userptr:
- fi-pnv-d510: NOTRUN -> [SKIP][5] ([fdo#109271]) +48 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-pnv-d510/igt@prime_vgem@basic-userptr.html
#### Possible fixes ####
* igt@gem_exec_parallel@engines@userptr:
- fi-pnv-d510: [INCOMPLETE][6] ([i915#299]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-pnv-d510/igt@gem_exec_parallel@engines@userptr.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-pnv-d510/igt@gem_exec_parallel@engines@userptr.html
* igt@kms_flip@basic-flip-vs-modeset@c-dp1:
- fi-cfl-8109u: [FAIL][8] ([i915#4165]) -> [PASS][9] +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cfl-8109u/igt@kms_flip@basic-flip-vs-modeset@c-dp1.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cfl-8109u/igt@kms_flip@basic-flip-vs-modeset@c-dp1.html
* igt@kms_flip@basic-plain-flip@c-dp2:
- fi-cfl-8109u: [DMESG-WARN][10] ([i915#295]) -> [PASS][11] +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cfl-8109u/igt@kms_flip@basic-plain-flip@c-dp2.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cfl-8109u/igt@kms_flip@basic-plain-flip@c-dp2.html
* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [DMESG-WARN][12] ([i915#4269]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cml-u2/igt@kms_frontbuffer_tracking@basic.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cml-u2/igt@kms_frontbuffer_tracking@basic.html
#### Warnings ####
* igt@kms_flip@basic-plain-flip@c-dp1:
- fi-cfl-8109u: [DMESG-WARN][14] ([i915#295]) -> [FAIL][15] ([i915#4165])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/fi-cfl-8109u/igt@kms_flip@basic-plain-flip@c-dp1.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/fi-cfl-8109u/igt@kms_flip@basic-plain-flip@c-dp1.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#299]: https://gitlab.freedesktop.org/drm/intel/issues/299
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4165]: https://gitlab.freedesktop.org/drm/intel/issues/4165
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
Participating hosts (39 -> 35)
------------------------------
Missing (4): fi-bsw-cyan fi-hsw-4200u bat-dg1-6 fi-elk-e7500
Build changes
-------------
* Linux: CI_DRM_10743 -> Patchwork_21351
CI-20190529: 20190529
CI_DRM_10743: 12c88a23f431212268d7d4d16d313f1d8661c7e5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6250: 3c2ac88757f0d0ac9450487d314fcaceebc8bc26 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21351: de0f37d0d3e13692d14c0e1c61bc6637237993bc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
de0f37d0d3e1 linux-next: build failure after merge of the drm-misc tree
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/index.html
[-- Attachment #2: Type: text/html, Size: 5761 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:26 ` [Intel-gfx] " Stephen Rothwell
` (3 preceding siblings ...)
(?)
@ 2021-10-15 19:04 ` Patchwork
-1 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2021-10-15 19:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 30281 bytes --]
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/95874/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10743_full -> Patchwork_21351_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21351_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_21351_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21351_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_bw@linear-tiling-3-displays-2560x1440p:
- shard-skl: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@kms_bw@linear-tiling-3-displays-2560x1440p.html
Known issues
------------
Here are the changes found in Patchwork_21351_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@device_reset@unbind-reset-rebind:
- shard-tglb: [PASS][2] -> [INCOMPLETE][3] ([i915#750])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb7/igt@device_reset@unbind-reset-rebind.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb8/igt@device_reset@unbind-reset-rebind.html
* igt@gem_ctx_persistence@idempotent:
- shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1099]) +4 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb7/igt@gem_ctx_persistence@idempotent.html
* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][5] -> [TIMEOUT][6] ([i915#2369] / [i915#3063] / [i915#3648])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb6/igt@gem_eio@unwedge-stress.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gem_eio@unwedge-stress.html
- shard-snb: NOTRUN -> [FAIL][7] ([i915#3354])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb6/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-pace@bcs0:
- shard-tglb: [PASS][8] -> [FAIL][9] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb6/igt@gem_exec_fair@basic-pace@bcs0.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb8/igt@gem_exec_fair@basic-pace@bcs0.html
* igt@gem_exec_reloc@basic-active@all:
- shard-glk: [PASS][10] -> [DMESG-WARN][11] ([i915#118])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-glk4/igt@gem_exec_reloc@basic-active@all.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk8/igt@gem_exec_reloc@basic-active@all.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][12] -> [SKIP][13] ([i915#2190])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb1/igt@gem_huc_copy@huc-copy.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb6/igt@gem_huc_copy@huc-copy.html
- shard-kbl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#2190])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl7/igt@gem_huc_copy@huc-copy.html
* igt@gem_pread@exhaustion:
- shard-snb: NOTRUN -> [WARN][15] ([i915#2658])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb5/igt@gem_pread@exhaustion.html
* igt@gem_pwrite@basic-exhaustion:
- shard-glk: NOTRUN -> [WARN][16] ([i915#2658])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@gem_pwrite@basic-exhaustion.html
* igt@gem_pxp@regular-baseline-src-copy-readible:
- shard-tglb: NOTRUN -> [SKIP][17] ([i915#4270])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gem_pxp@regular-baseline-src-copy-readible.html
* igt@gem_userptr_blits@invalid-mmap-offset-unsync:
- shard-tglb: NOTRUN -> [SKIP][18] ([i915#3297])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gem_userptr_blits@invalid-mmap-offset-unsync.html
* igt@gem_userptr_blits@vma-merge:
- shard-skl: NOTRUN -> [FAIL][19] ([i915#3318])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@gem_userptr_blits@vma-merge.html
* igt@gen3_mixed_blits:
- shard-tglb: NOTRUN -> [SKIP][20] ([fdo#109289])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gen3_mixed_blits.html
* igt@gen9_exec_parse@shadow-peek:
- shard-tglb: NOTRUN -> [SKIP][21] ([i915#2856]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@gen9_exec_parse@shadow-peek.html
* igt@i915_pm_dc@dc9-dpms:
- shard-tglb: NOTRUN -> [SKIP][22] ([i915#4281])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@i915_pm_dc@dc9-dpms.html
* igt@i915_pm_rpm@dpms-mode-unset-non-lpsp:
- shard-tglb: NOTRUN -> [SKIP][23] ([fdo#111644] / [i915#1397] / [i915#2411])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@i915_pm_rpm@dpms-mode-unset-non-lpsp.html
* igt@i915_pm_rpm@gem-execbuf-stress-pc8:
- shard-tglb: NOTRUN -> [SKIP][24] ([fdo#109506] / [i915#2411])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@i915_pm_rpm@gem-execbuf-stress-pc8.html
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-skl: [PASS][25] -> [INCOMPLETE][26] ([i915#151])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl10/igt@i915_pm_rpm@system-suspend-modeset.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl4/igt@i915_pm_rpm@system-suspend-modeset.html
* igt@kms_addfb_basic@invalid-smem-bo-on-discrete:
- shard-tglb: NOTRUN -> [SKIP][27] ([i915#3826])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_addfb_basic@invalid-smem-bo-on-discrete.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [PASS][28] -> [FAIL][29] ([i915#2521])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl8/igt@kms_async_flips@alternate-sync-async-flip.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl5/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_big_fb@x-tiled-16bpp-rotate-90:
- shard-tglb: NOTRUN -> [SKIP][30] ([fdo#111614]) +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_big_fb@x-tiled-16bpp-rotate-90.html
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip:
- shard-glk: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#3777])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip.html
* igt@kms_big_fb@yf-tiled-32bpp-rotate-0:
- shard-tglb: NOTRUN -> [SKIP][32] ([fdo#111615]) +2 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@kms_big_fb@yf-tiled-32bpp-rotate-0.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][33] ([fdo#109271] / [i915#3777]) +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl7/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_joiner@basic:
- shard-tglb: NOTRUN -> [SKIP][34] ([i915#2705])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@kms_big_joiner@basic.html
* igt@kms_bw@linear-tiling-2-displays-2560x1440p:
- shard-apl: NOTRUN -> [DMESG-FAIL][35] ([i915#4298]) +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl2/igt@kms_bw@linear-tiling-2-displays-2560x1440p.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][36] ([fdo#109271] / [i915#3886]) +2 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs:
- shard-glk: NOTRUN -> [SKIP][37] ([fdo#109271]) +36 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
* igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][38] ([i915#3689] / [i915#3886]) +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#3886]) +6 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl7/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#3886]) +2 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][41] ([i915#3689]) +8 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@kms_ccs@pipe-d-bad-aux-stride-y_tiled_ccs.html
* igt@kms_cdclk@mode-transition:
- shard-tglb: NOTRUN -> [SKIP][42] ([i915#3742])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_cdclk@mode-transition.html
* igt@kms_chamelium@hdmi-audio:
- shard-glk: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@kms_chamelium@hdmi-audio.html
* igt@kms_chamelium@vga-hpd-enable-disable-mode:
- shard-apl: NOTRUN -> [SKIP][44] ([fdo#109271] / [fdo#111827]) +3 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl7/igt@kms_chamelium@vga-hpd-enable-disable-mode.html
* igt@kms_chamelium@vga-hpd-for-each-pipe:
- shard-skl: NOTRUN -> [SKIP][45] ([fdo#109271] / [fdo#111827]) +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl7/igt@kms_chamelium@vga-hpd-for-each-pipe.html
* igt@kms_color_chamelium@pipe-c-ctm-negative:
- shard-kbl: NOTRUN -> [SKIP][46] ([fdo#109271] / [fdo#111827]) +1 similar issue
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl7/igt@kms_color_chamelium@pipe-c-ctm-negative.html
* igt@kms_color_chamelium@pipe-d-ctm-0-5:
- shard-snb: NOTRUN -> [SKIP][47] ([fdo#109271] / [fdo#111827]) +16 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb7/igt@kms_color_chamelium@pipe-d-ctm-0-5.html
* igt@kms_color_chamelium@pipe-d-ctm-limited-range:
- shard-tglb: NOTRUN -> [SKIP][48] ([fdo#109284] / [fdo#111827]) +7 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@kms_color_chamelium@pipe-d-ctm-limited-range.html
* igt@kms_content_protection@legacy:
- shard-tglb: NOTRUN -> [SKIP][49] ([fdo#111828])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_content_protection@legacy.html
* igt@kms_cursor_crc@pipe-b-cursor-32x10-onscreen:
- shard-tglb: NOTRUN -> [SKIP][50] ([i915#3359]) +3 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@kms_cursor_crc@pipe-b-cursor-32x10-onscreen.html
* igt@kms_cursor_crc@pipe-b-cursor-512x512-rapid-movement:
- shard-tglb: NOTRUN -> [SKIP][51] ([fdo#109279] / [i915#3359])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_cursor_crc@pipe-b-cursor-512x512-rapid-movement.html
* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-glk: NOTRUN -> [SKIP][52] ([fdo#109271] / [i915#533])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@kms_cursor_legacy@pipe-d-torture-bo.html
* igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled:
- shard-skl: [PASS][53] -> [DMESG-WARN][54] ([i915#1982])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl5/igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl8/igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1:
- shard-skl: [PASS][55] -> [FAIL][56] ([i915#79]) +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl8/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html
* igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1:
- shard-glk: [PASS][57] -> [FAIL][58] ([i915#79])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-glk4/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk6/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a1.html
* igt@kms_flip@flip-vs-suspend-interruptible@b-edp1:
- shard-skl: [PASS][59] -> [INCOMPLETE][60] ([i915#198]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl3/igt@kms_flip@flip-vs-suspend-interruptible@b-edp1.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl8/igt@kms_flip@flip-vs-suspend-interruptible@b-edp1.html
* igt@kms_flip@flip-vs-suspend@a-edp1:
- shard-tglb: [PASS][61] -> [INCOMPLETE][62] ([i915#2411] / [i915#456]) +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb2/igt@kms_flip@flip-vs-suspend@a-edp1.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb7/igt@kms_flip@flip-vs-suspend@a-edp1.html
* igt@kms_flip@plain-flip-fb-recreate@c-edp1:
- shard-skl: [PASS][63] -> [FAIL][64] ([i915#2122]) +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl2/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl7/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile:
- shard-iclb: [PASS][65] -> [SKIP][66] ([i915#3701]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-iclb1/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile:
- shard-snb: NOTRUN -> [SKIP][67] ([fdo#109271]) +374 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb2/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-cpu:
- shard-apl: NOTRUN -> [SKIP][68] ([fdo#109271]) +70 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@fbc-farfromfence-mmap-gtt:
- shard-skl: NOTRUN -> [SKIP][69] ([fdo#109271]) +37 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@kms_frontbuffer_tracking@fbc-farfromfence-mmap-gtt.html
* igt@kms_frontbuffer_tracking@fbcpsr-suspend:
- shard-tglb: [PASS][70] -> [INCOMPLETE][71] ([i915#456])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-fullscreen:
- shard-kbl: NOTRUN -> [SKIP][72] ([fdo#109271]) +32 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl7/igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-fullscreen.html
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-draw-pwrite:
- shard-tglb: NOTRUN -> [SKIP][73] ([fdo#111825]) +15 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-draw-pwrite.html
* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][74] -> [FAIL][75] ([i915#1188])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl5/igt@kms_hdr@bpc-switch.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl5/igt@kms_hdr@bpc-switch.html
* igt@kms_hdr@static-toggle-dpms:
- shard-tglb: NOTRUN -> [SKIP][76] ([i915#1187])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_hdr@static-toggle-dpms.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- shard-apl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#533])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl6/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-kbl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#533])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl7/igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][79] ([fdo#108145] / [i915#265])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl2/igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb.html
* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][80] ([i915#265])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl2/igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-glk: NOTRUN -> [FAIL][81] ([i915#265])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html
* igt@kms_plane_lowres@pipe-b-tiling-none:
- shard-tglb: NOTRUN -> [SKIP][82] ([i915#3536])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@kms_plane_lowres@pipe-b-tiling-none.html
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-apl: NOTRUN -> [SKIP][83] ([fdo#109271] / [i915#2733])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl2/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2:
- shard-glk: NOTRUN -> [SKIP][84] ([fdo#109271] / [i915#658]) +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-2.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1:
- shard-apl: NOTRUN -> [SKIP][85] ([fdo#109271] / [i915#658]) +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl7/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-1.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2:
- shard-skl: NOTRUN -> [SKIP][86] ([fdo#109271] / [i915#658])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-2.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1:
- shard-kbl: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#658]) +1 similar issue
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl7/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html
* igt@kms_psr2_su@frontbuffer:
- shard-tglb: NOTRUN -> [SKIP][88] ([i915#1911])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@kms_psr2_su@frontbuffer.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-tglb: NOTRUN -> [FAIL][89] ([i915#132] / [i915#3467])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [PASS][90] -> [SKIP][91] ([fdo#109441]) +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-iclb5/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@nouveau_crc@pipe-c-ctx-flip-skip-current-frame:
- shard-tglb: NOTRUN -> [SKIP][92] ([i915#2530]) +1 similar issue
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@nouveau_crc@pipe-c-ctx-flip-skip-current-frame.html
* igt@prime_nv_api@i915_self_import_to_different_fd:
- shard-tglb: NOTRUN -> [SKIP][93] ([fdo#109291]) +1 similar issue
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb3/igt@prime_nv_api@i915_self_import_to_different_fd.html
* igt@prime_vgem@fence-read-hang:
- shard-tglb: NOTRUN -> [SKIP][94] ([fdo#109295])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@prime_vgem@fence-read-hang.html
* igt@sysfs_clients@fair-0:
- shard-skl: NOTRUN -> [SKIP][95] ([fdo#109271] / [i915#2994])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@sysfs_clients@fair-0.html
* igt@sysfs_clients@recycle-many:
- shard-apl: NOTRUN -> [SKIP][96] ([fdo#109271] / [i915#2994])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl2/igt@sysfs_clients@recycle-many.html
* igt@sysfs_clients@sema-10:
- shard-glk: NOTRUN -> [SKIP][97] ([fdo#109271] / [i915#2994])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk5/igt@sysfs_clients@sema-10.html
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-apl: [DMESG-WARN][98] ([i915#180]) -> [PASS][99] +1 similar issue
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-apl8/igt@gem_ctx_isolation@preservation-s3@vcs0.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-apl6/igt@gem_ctx_isolation@preservation-s3@vcs0.html
* igt@gem_ctx_persistence@engines-hostile@vecs0:
- shard-kbl: [FAIL][100] ([i915#2410]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-kbl3/igt@gem_ctx_persistence@engines-hostile@vecs0.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl3/igt@gem_ctx_persistence@engines-hostile@vecs0.html
* igt@gem_eio@in-flight-contexts-immediate:
- shard-iclb: [TIMEOUT][102] ([i915#3070]) -> [PASS][103]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-iclb1/igt@gem_eio@in-flight-contexts-immediate.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-iclb2/igt@gem_eio@in-flight-contexts-immediate.html
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [FAIL][104] ([i915#2842]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb5/igt@gem_exec_fair@basic-flow@rcs0.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb5/igt@gem_exec_fair@basic-flow@rcs0.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [FAIL][106] ([i915#2842]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-iclb2/igt@gem_exec_fair@basic-none-share@rcs0.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-iclb1/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none@vecs0:
- shard-glk: [FAIL][108] ([i915#2842] / [i915#3468]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-glk1/igt@gem_exec_fair@basic-none@vecs0.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk3/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [FAIL][110] ([i915#2842]) -> [PASS][111] +2 similar issues
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-glk4/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-glk6/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-tglb: [FAIL][112] ([i915#2851]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb6/igt@gem_exec_fair@basic-pace@rcs0.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb8/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: [FAIL][114] ([i915#2842]) -> [PASS][115] +1 similar issue
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-kbl6/igt@gem_exec_fair@basic-pace@vecs0.html
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl2/igt@gem_exec_fair@basic-pace@vecs0.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][116] ([i915#454]) -> [PASS][117]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-iclb4/igt@i915_pm_dc@dc6-psr.html
* igt@i915_suspend@debugfs-reader:
- shard-tglb: [INCOMPLETE][118] ([i915#456]) -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-tglb7/igt@i915_suspend@debugfs-reader.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-tglb2/igt@i915_suspend@debugfs-reader.html
* igt@i915_suspend@forcewake:
- shard-skl: [INCOMPLETE][120] ([i915#636]) -> [PASS][121]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl3/igt@i915_suspend@forcewake.html
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl1/igt@i915_suspend@forcewake.html
* igt@kms_cursor_crc@pipe-a-cursor-256x256-random:
- shard-snb: [SKIP][122] ([fdo#109271]) -> [PASS][123]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-snb2/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-snb2/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [FAIL][124] ([i915#2346]) -> [PASS][125]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl10/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1:
- shard-kbl: [FAIL][126] ([i915#79]) -> [PASS][127]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-kbl3/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl6/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1.html
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [FAIL][128] ([i915#79]) -> [PASS][129]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl8/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl9/igt@kms_flip@flip-vs-expired-vblank@b-edp1.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1:
- shard-skl: [FAIL][130] ([i915#2122]) -> [PASS][131] +1 similar issue
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl4/igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-skl4/igt@kms_flip@plain-flip-fb-recreate-interruptible@b-edp1.html
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-kbl: [DMESG-WARN][132] ([i915#180]) -> [PASS][133]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/shard-kbl7/igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][134] ([fdo#108145] / [i915#265]) -> [PASS][135] +1 similar issue
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10743/shard-skl2/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patch
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21351/index.html
[-- Attachment #2: Type: text/html, Size: 33606 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-10-15 9:26 ` [Intel-gfx] " Stephen Rothwell
(?)
@ 2021-11-01 8:42 ` Stephen Rothwell
-1 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-01 8:42 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3456 bytes --]
Hi all,
On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~~~~~~~~~~~~~~~~~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
This has reappeared today. I don't know what happened to the drm-misc
tree over the weeked :-(
I have reapplied the above fix.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-01 8:42 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-01 8:42 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Next Mailing List, Linux Kernel Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3456 bytes --]
Hi all,
On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~~~~~~~~~~~~~~~~~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
This has reappeared today. I don't know what happened to the drm-misc
tree over the weeked :-(
I have reapplied the above fix.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-01 8:42 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-01 8:42 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI
Cc: Jani Nikula, Linux Next Mailing List, Linux Kernel Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3456 bytes --]
Hi all,
On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> 111 | static depot_stack_handle_t __stack_depot_save(void)
> | ^~~~~~~~~~~~~~~~~~
> In file included from include/linux/page_ext.h:7,
> from include/linux/mm.h:25,
> from include/linux/kallsyms.h:13,
> from include/linux/bpf.h:20,
> from include/linux/bpf-cgroup.h:5,
> from include/linux/cgroup-defs.h:22,
> from include/linux/cgroup.h:28,
> from include/linux/memcontrol.h:13,
> from include/linux/swap.h:9,
> from include/linux/suspend.h:5,
> from include/linux/regulator/consumer.h:35,
> from include/linux/i2c.h:18,
> from include/drm/drm_crtc.h:28,
> from include/drm/drm_atomic.h:31,
> from drivers/gpu/drm/drm_modeset_lock.c:24:
> include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> | ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>
> This may only have been revealed because of another fix I have had to
> apply today.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 15 Oct 2021 20:17:52 +1100
> Subject: [PATCH] drm/locking: fix for name conflict
>
> Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> index 4d32b61fa1fd..ee36dd20900d 100644
> --- a/drivers/gpu/drm/drm_modeset_lock.c
> +++ b/drivers/gpu/drm/drm_modeset_lock.c
> @@ -79,7 +79,7 @@
> static DEFINE_WW_CLASS(crtc_ww_class);
>
> #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> -static noinline depot_stack_handle_t __stack_depot_save(void)
> +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> {
> unsigned long entries[8];
> unsigned int n;
> @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> kfree(buf);
> }
> #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> -static depot_stack_handle_t __stack_depot_save(void)
> +static depot_stack_handle_t __drm_stack_depot_save(void)
> {
> return 0;
> }
> @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> ret = 0;
> } else if (ret == -EDEADLK) {
> ctx->contended = lock;
> - ctx->stack_depot = __stack_depot_save();
> + ctx->stack_depot = __drm_stack_depot_save();
> }
>
> return ret;
> --
> 2.33.0
This has reappeared today. I don't know what happened to the drm-misc
tree over the weeked :-(
I have reapplied the above fix.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-01 8:42 ` Stephen Rothwell
(?)
@ 2021-11-05 6:15 ` Stephen Rothwell
-1 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-05 6:15 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Jani Nikula,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3827 bytes --]
Hi all,
On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> > | ^~~~~~~~~~~~~~~~~~
> > In file included from include/linux/page_ext.h:7,
> > from include/linux/mm.h:25,
> > from include/linux/kallsyms.h:13,
> > from include/linux/bpf.h:20,
> > from include/linux/bpf-cgroup.h:5,
> > from include/linux/cgroup-defs.h:22,
> > from include/linux/cgroup.h:28,
> > from include/linux/memcontrol.h:13,
> > from include/linux/swap.h:9,
> > from include/linux/suspend.h:5,
> > from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from include/drm/drm_crtc.h:28,
> > from include/drm/drm_atomic.h:31,
> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> > | ^~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >
> > This may only have been revealed because of another fix I have had to
> > apply today.
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> > Subject: [PATCH] drm/locking: fix for name conflict
> >
> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> > index 4d32b61fa1fd..ee36dd20900d 100644
> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> > @@ -79,7 +79,7 @@
> > static DEFINE_WW_CLASS(crtc_ww_class);
> >
> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > unsigned long entries[8];
> > unsigned int n;
> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> > kfree(buf);
> > }
> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> > -static depot_stack_handle_t __stack_depot_save(void)
> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > return 0;
> > }
> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> > ret = 0;
> > } else if (ret == -EDEADLK) {
> > ctx->contended = lock;
> > - ctx->stack_depot = __stack_depot_save();
> > + ctx->stack_depot = __drm_stack_depot_save();
> > }
> >
> > return ret;
>
> This has reappeared today. I don't know what happened to the drm-misc
> tree over the weeked :-(
>
> I have reapplied the above fix.
So the above drm-misc commit is now in the drm tree, but its fix up
commit vanished from the drm-misc tree over the past weekend :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-05 6:15 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-05 6:15 UTC (permalink / raw)
To: Dave Airlie
Cc: Jani Nikula, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3827 bytes --]
Hi all,
On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> > | ^~~~~~~~~~~~~~~~~~
> > In file included from include/linux/page_ext.h:7,
> > from include/linux/mm.h:25,
> > from include/linux/kallsyms.h:13,
> > from include/linux/bpf.h:20,
> > from include/linux/bpf-cgroup.h:5,
> > from include/linux/cgroup-defs.h:22,
> > from include/linux/cgroup.h:28,
> > from include/linux/memcontrol.h:13,
> > from include/linux/swap.h:9,
> > from include/linux/suspend.h:5,
> > from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from include/drm/drm_crtc.h:28,
> > from include/drm/drm_atomic.h:31,
> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> > | ^~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >
> > This may only have been revealed because of another fix I have had to
> > apply today.
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> > Subject: [PATCH] drm/locking: fix for name conflict
> >
> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> > index 4d32b61fa1fd..ee36dd20900d 100644
> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> > @@ -79,7 +79,7 @@
> > static DEFINE_WW_CLASS(crtc_ww_class);
> >
> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > unsigned long entries[8];
> > unsigned int n;
> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> > kfree(buf);
> > }
> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> > -static depot_stack_handle_t __stack_depot_save(void)
> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > return 0;
> > }
> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> > ret = 0;
> > } else if (ret == -EDEADLK) {
> > ctx->contended = lock;
> > - ctx->stack_depot = __stack_depot_save();
> > + ctx->stack_depot = __drm_stack_depot_save();
> > }
> >
> > return ret;
>
> This has reappeared today. I don't know what happened to the drm-misc
> tree over the weeked :-(
>
> I have reapplied the above fix.
So the above drm-misc commit is now in the drm tree, but its fix up
commit vanished from the drm-misc tree over the past weekend :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-05 6:15 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-05 6:15 UTC (permalink / raw)
To: Dave Airlie
Cc: Jani Nikula, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 3827 bytes --]
Hi all,
On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> > | ^~~~~~~~~~~~~~~~~~
> > In file included from include/linux/page_ext.h:7,
> > from include/linux/mm.h:25,
> > from include/linux/kallsyms.h:13,
> > from include/linux/bpf.h:20,
> > from include/linux/bpf-cgroup.h:5,
> > from include/linux/cgroup-defs.h:22,
> > from include/linux/cgroup.h:28,
> > from include/linux/memcontrol.h:13,
> > from include/linux/swap.h:9,
> > from include/linux/suspend.h:5,
> > from include/linux/regulator/consumer.h:35,
> > from include/linux/i2c.h:18,
> > from include/drm/drm_crtc.h:28,
> > from include/drm/drm_atomic.h:31,
> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> > | ^~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >
> > This may only have been revealed because of another fix I have had to
> > apply today.
> >
> > I have applied the following patch for today.
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> > Subject: [PATCH] drm/locking: fix for name conflict
> >
> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> > index 4d32b61fa1fd..ee36dd20900d 100644
> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> > @@ -79,7 +79,7 @@
> > static DEFINE_WW_CLASS(crtc_ww_class);
> >
> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > unsigned long entries[8];
> > unsigned int n;
> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> > kfree(buf);
> > }
> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> > -static depot_stack_handle_t __stack_depot_save(void)
> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> > {
> > return 0;
> > }
> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> > ret = 0;
> > } else if (ret == -EDEADLK) {
> > ctx->contended = lock;
> > - ctx->stack_depot = __stack_depot_save();
> > + ctx->stack_depot = __drm_stack_depot_save();
> > }
> >
> > return ret;
>
> This has reappeared today. I don't know what happened to the drm-misc
> tree over the weeked :-(
>
> I have reapplied the above fix.
So the above drm-misc commit is now in the drm tree, but its fix up
commit vanished from the drm-misc tree over the past weekend :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-05 6:15 ` Stephen Rothwell
(?)
@ 2021-11-05 11:03 ` Jani Nikula
-1 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-05 11:03 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann, Maarten Lankhorst,
Maxime Ripard
On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (arm
>> > multi_v7_defconfig) failed like this:
>> >
>> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
>> > 111 | static depot_stack_handle_t __stack_depot_save(void)
>> > | ^~~~~~~~~~~~~~~~~~
>> > In file included from include/linux/page_ext.h:7,
>> > from include/linux/mm.h:25,
>> > from include/linux/kallsyms.h:13,
>> > from include/linux/bpf.h:20,
>> > from include/linux/bpf-cgroup.h:5,
>> > from include/linux/cgroup-defs.h:22,
>> > from include/linux/cgroup.h:28,
>> > from include/linux/memcontrol.h:13,
>> > from include/linux/swap.h:9,
>> > from include/linux/suspend.h:5,
>> > from include/linux/regulator/consumer.h:35,
>> > from include/linux/i2c.h:18,
>> > from include/drm/drm_crtc.h:28,
>> > from include/drm/drm_atomic.h:31,
>> > from drivers/gpu/drm/drm_modeset_lock.c:24:
>> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
>> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
>> > | ^~~~~~~~~~~~~~~~~~
>> >
>> > Caused by commit
>> >
>> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> >
>> > This may only have been revealed because of another fix I have had to
>> > apply today.
>> >
>> > I have applied the following patch for today.
>> >
>> > From: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Date: Fri, 15 Oct 2021 20:17:52 +1100
>> > Subject: [PATCH] drm/locking: fix for name conflict
>> >
>> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> > ---
>> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
>> > 1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
>> > index 4d32b61fa1fd..ee36dd20900d 100644
>> > --- a/drivers/gpu/drm/drm_modeset_lock.c
>> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
>> > @@ -79,7 +79,7 @@
>> > static DEFINE_WW_CLASS(crtc_ww_class);
>> >
>> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
>> > -static noinline depot_stack_handle_t __stack_depot_save(void)
>> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > unsigned long entries[8];
>> > unsigned int n;
>> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
>> > kfree(buf);
>> > }
>> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
>> > -static depot_stack_handle_t __stack_depot_save(void)
>> > +static depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > return 0;
>> > }
>> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
>> > ret = 0;
>> > } else if (ret == -EDEADLK) {
>> > ctx->contended = lock;
>> > - ctx->stack_depot = __stack_depot_save();
>> > + ctx->stack_depot = __drm_stack_depot_save();
>> > }
>> >
>> > return ret;
>>
>> This has reappeared today. I don't know what happened to the drm-misc
>> tree over the weeked :-(
>>
>> I have reapplied the above fix.
>
> So the above drm-misc commit is now in the drm tree, but its fix up
> commit vanished from the drm-misc tree over the past weekend :-(
Cc: drm-misc maintainers.
We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
drm-misc-next-fixes during the merge window. This is because
drm-misc-next already starts accumulating stuff that's headed to one
release later, e.g. currently v5.17. I think that's part of the reason.
I probably should have pushed c4f08d7246a5 ("drm/locking: fix
__stack_depot_* name conflict") to drm-misc-next-fixes.
There's still something funny going on, because the drm-misc-next pull
request [1] isn't part of the drm pull request for v5.16 [2]. Is there
going to be another drm pull?
BR,
Jani.
[1] https://lore.kernel.org/r/20211014120452.2wicnt6hobu3kbwb@gilmour
[2] https://lore.kernel.org/r/CAPM=9tyOyz4_-OdjDduFkponSXycO6maBDFsWGTLv+j=_Vp6ww@mail.gmail.com
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-05 11:03 ` Jani Nikula
0 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-05 11:03 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI,
Linux Next Mailing List, Thomas Zimmermann
On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (arm
>> > multi_v7_defconfig) failed like this:
>> >
>> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
>> > 111 | static depot_stack_handle_t __stack_depot_save(void)
>> > | ^~~~~~~~~~~~~~~~~~
>> > In file included from include/linux/page_ext.h:7,
>> > from include/linux/mm.h:25,
>> > from include/linux/kallsyms.h:13,
>> > from include/linux/bpf.h:20,
>> > from include/linux/bpf-cgroup.h:5,
>> > from include/linux/cgroup-defs.h:22,
>> > from include/linux/cgroup.h:28,
>> > from include/linux/memcontrol.h:13,
>> > from include/linux/swap.h:9,
>> > from include/linux/suspend.h:5,
>> > from include/linux/regulator/consumer.h:35,
>> > from include/linux/i2c.h:18,
>> > from include/drm/drm_crtc.h:28,
>> > from include/drm/drm_atomic.h:31,
>> > from drivers/gpu/drm/drm_modeset_lock.c:24:
>> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
>> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
>> > | ^~~~~~~~~~~~~~~~~~
>> >
>> > Caused by commit
>> >
>> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> >
>> > This may only have been revealed because of another fix I have had to
>> > apply today.
>> >
>> > I have applied the following patch for today.
>> >
>> > From: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Date: Fri, 15 Oct 2021 20:17:52 +1100
>> > Subject: [PATCH] drm/locking: fix for name conflict
>> >
>> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> > ---
>> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
>> > 1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
>> > index 4d32b61fa1fd..ee36dd20900d 100644
>> > --- a/drivers/gpu/drm/drm_modeset_lock.c
>> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
>> > @@ -79,7 +79,7 @@
>> > static DEFINE_WW_CLASS(crtc_ww_class);
>> >
>> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
>> > -static noinline depot_stack_handle_t __stack_depot_save(void)
>> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > unsigned long entries[8];
>> > unsigned int n;
>> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
>> > kfree(buf);
>> > }
>> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
>> > -static depot_stack_handle_t __stack_depot_save(void)
>> > +static depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > return 0;
>> > }
>> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
>> > ret = 0;
>> > } else if (ret == -EDEADLK) {
>> > ctx->contended = lock;
>> > - ctx->stack_depot = __stack_depot_save();
>> > + ctx->stack_depot = __drm_stack_depot_save();
>> > }
>> >
>> > return ret;
>>
>> This has reappeared today. I don't know what happened to the drm-misc
>> tree over the weeked :-(
>>
>> I have reapplied the above fix.
>
> So the above drm-misc commit is now in the drm tree, but its fix up
> commit vanished from the drm-misc tree over the past weekend :-(
Cc: drm-misc maintainers.
We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
drm-misc-next-fixes during the merge window. This is because
drm-misc-next already starts accumulating stuff that's headed to one
release later, e.g. currently v5.17. I think that's part of the reason.
I probably should have pushed c4f08d7246a5 ("drm/locking: fix
__stack_depot_* name conflict") to drm-misc-next-fixes.
There's still something funny going on, because the drm-misc-next pull
request [1] isn't part of the drm pull request for v5.16 [2]. Is there
going to be another drm pull?
BR,
Jani.
[1] https://lore.kernel.org/r/20211014120452.2wicnt6hobu3kbwb@gilmour
[2] https://lore.kernel.org/r/CAPM=9tyOyz4_-OdjDduFkponSXycO6maBDFsWGTLv+j=_Vp6ww@mail.gmail.com
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-05 11:03 ` Jani Nikula
0 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-05 11:03 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie
Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI,
Linux Next Mailing List, Maxime Ripard, Thomas Zimmermann
On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > After merging the drm-misc tree, today's linux-next build (arm
>> > multi_v7_defconfig) failed like this:
>> >
>> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
>> > 111 | static depot_stack_handle_t __stack_depot_save(void)
>> > | ^~~~~~~~~~~~~~~~~~
>> > In file included from include/linux/page_ext.h:7,
>> > from include/linux/mm.h:25,
>> > from include/linux/kallsyms.h:13,
>> > from include/linux/bpf.h:20,
>> > from include/linux/bpf-cgroup.h:5,
>> > from include/linux/cgroup-defs.h:22,
>> > from include/linux/cgroup.h:28,
>> > from include/linux/memcontrol.h:13,
>> > from include/linux/swap.h:9,
>> > from include/linux/suspend.h:5,
>> > from include/linux/regulator/consumer.h:35,
>> > from include/linux/i2c.h:18,
>> > from include/drm/drm_crtc.h:28,
>> > from include/drm/drm_atomic.h:31,
>> > from drivers/gpu/drm/drm_modeset_lock.c:24:
>> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
>> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
>> > | ^~~~~~~~~~~~~~~~~~
>> >
>> > Caused by commit
>> >
>> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> >
>> > This may only have been revealed because of another fix I have had to
>> > apply today.
>> >
>> > I have applied the following patch for today.
>> >
>> > From: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Date: Fri, 15 Oct 2021 20:17:52 +1100
>> > Subject: [PATCH] drm/locking: fix for name conflict
>> >
>> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
>> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> > ---
>> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
>> > 1 file changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
>> > index 4d32b61fa1fd..ee36dd20900d 100644
>> > --- a/drivers/gpu/drm/drm_modeset_lock.c
>> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
>> > @@ -79,7 +79,7 @@
>> > static DEFINE_WW_CLASS(crtc_ww_class);
>> >
>> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
>> > -static noinline depot_stack_handle_t __stack_depot_save(void)
>> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > unsigned long entries[8];
>> > unsigned int n;
>> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
>> > kfree(buf);
>> > }
>> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
>> > -static depot_stack_handle_t __stack_depot_save(void)
>> > +static depot_stack_handle_t __drm_stack_depot_save(void)
>> > {
>> > return 0;
>> > }
>> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
>> > ret = 0;
>> > } else if (ret == -EDEADLK) {
>> > ctx->contended = lock;
>> > - ctx->stack_depot = __stack_depot_save();
>> > + ctx->stack_depot = __drm_stack_depot_save();
>> > }
>> >
>> > return ret;
>>
>> This has reappeared today. I don't know what happened to the drm-misc
>> tree over the weeked :-(
>>
>> I have reapplied the above fix.
>
> So the above drm-misc commit is now in the drm tree, but its fix up
> commit vanished from the drm-misc tree over the past weekend :-(
Cc: drm-misc maintainers.
We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
drm-misc-next-fixes during the merge window. This is because
drm-misc-next already starts accumulating stuff that's headed to one
release later, e.g. currently v5.17. I think that's part of the reason.
I probably should have pushed c4f08d7246a5 ("drm/locking: fix
__stack_depot_* name conflict") to drm-misc-next-fixes.
There's still something funny going on, because the drm-misc-next pull
request [1] isn't part of the drm pull request for v5.16 [2]. Is there
going to be another drm pull?
BR,
Jani.
[1] https://lore.kernel.org/r/20211014120452.2wicnt6hobu3kbwb@gilmour
[2] https://lore.kernel.org/r/CAPM=9tyOyz4_-OdjDduFkponSXycO6maBDFsWGTLv+j=_Vp6ww@mail.gmail.com
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-05 11:03 ` Jani Nikula
(?)
@ 2021-11-05 11:57 ` Maxime Ripard
-1 siblings, 0 replies; 38+ messages in thread
From: Maxime Ripard @ 2021-11-05 11:57 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
DRI, Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann, Maarten Lankhorst
[-- Attachment #1: Type: text/plain, Size: 5101 bytes --]
Hi,
On Fri, Nov 05, 2021 at 01:03:43PM +0200, Jani Nikula wrote:
> On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> >
> >> > After merging the drm-misc tree, today's linux-next build (arm
> >> > multi_v7_defconfig) failed like this:
> >> >
> >> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> >> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> >> > | ^~~~~~~~~~~~~~~~~~
> >> > In file included from include/linux/page_ext.h:7,
> >> > from include/linux/mm.h:25,
> >> > from include/linux/kallsyms.h:13,
> >> > from include/linux/bpf.h:20,
> >> > from include/linux/bpf-cgroup.h:5,
> >> > from include/linux/cgroup-defs.h:22,
> >> > from include/linux/cgroup.h:28,
> >> > from include/linux/memcontrol.h:13,
> >> > from include/linux/swap.h:9,
> >> > from include/linux/suspend.h:5,
> >> > from include/linux/regulator/consumer.h:35,
> >> > from include/linux/i2c.h:18,
> >> > from include/drm/drm_crtc.h:28,
> >> > from include/drm/drm_atomic.h:31,
> >> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> >> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> >> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> >> > | ^~~~~~~~~~~~~~~~~~
> >> >
> >> > Caused by commit
> >> >
> >> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> >
> >> > This may only have been revealed because of another fix I have had to
> >> > apply today.
> >> >
> >> > I have applied the following patch for today.
> >> >
> >> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> >> > Subject: [PATCH] drm/locking: fix for name conflict
> >> >
> >> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > ---
> >> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> >> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> >> > index 4d32b61fa1fd..ee36dd20900d 100644
> >> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> >> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> >> > @@ -79,7 +79,7 @@
> >> > static DEFINE_WW_CLASS(crtc_ww_class);
> >> >
> >> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> >> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> >> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > unsigned long entries[8];
> >> > unsigned int n;
> >> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> >> > kfree(buf);
> >> > }
> >> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> >> > -static depot_stack_handle_t __stack_depot_save(void)
> >> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > return 0;
> >> > }
> >> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> >> > ret = 0;
> >> > } else if (ret == -EDEADLK) {
> >> > ctx->contended = lock;
> >> > - ctx->stack_depot = __stack_depot_save();
> >> > + ctx->stack_depot = __drm_stack_depot_save();
> >> > }
> >> >
> >> > return ret;
> >>
> >> This has reappeared today. I don't know what happened to the drm-misc
> >> tree over the weeked :-(
> >>
> >> I have reapplied the above fix.
> >
> > So the above drm-misc commit is now in the drm tree, but its fix up
> > commit vanished from the drm-misc tree over the past weekend :-(
>
> Cc: drm-misc maintainers.
>
> We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
> drm-misc-next-fixes during the merge window. This is because
> drm-misc-next already starts accumulating stuff that's headed to one
> release later, e.g. currently v5.17. I think that's part of the reason.
Indeed
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> There's still something funny going on, because the drm-misc-next pull
> request [1] isn't part of the drm pull request for v5.16 [2]. Is there
> going to be another drm pull?
The last drm-misc-next PR for some reason didn't got logged into
patchwork, and Dave missed it.
We found out yesterday, and he pulled it today so I assume there will be
a second PR with that last PR and today's drm-misc-next-fixes PR.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-05 11:57 ` Maxime Ripard
0 siblings, 0 replies; 38+ messages in thread
From: Maxime Ripard @ 2021-11-05 11:57 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 5101 bytes --]
Hi,
On Fri, Nov 05, 2021 at 01:03:43PM +0200, Jani Nikula wrote:
> On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> >
> >> > After merging the drm-misc tree, today's linux-next build (arm
> >> > multi_v7_defconfig) failed like this:
> >> >
> >> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> >> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> >> > | ^~~~~~~~~~~~~~~~~~
> >> > In file included from include/linux/page_ext.h:7,
> >> > from include/linux/mm.h:25,
> >> > from include/linux/kallsyms.h:13,
> >> > from include/linux/bpf.h:20,
> >> > from include/linux/bpf-cgroup.h:5,
> >> > from include/linux/cgroup-defs.h:22,
> >> > from include/linux/cgroup.h:28,
> >> > from include/linux/memcontrol.h:13,
> >> > from include/linux/swap.h:9,
> >> > from include/linux/suspend.h:5,
> >> > from include/linux/regulator/consumer.h:35,
> >> > from include/linux/i2c.h:18,
> >> > from include/drm/drm_crtc.h:28,
> >> > from include/drm/drm_atomic.h:31,
> >> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> >> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> >> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> >> > | ^~~~~~~~~~~~~~~~~~
> >> >
> >> > Caused by commit
> >> >
> >> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> >
> >> > This may only have been revealed because of another fix I have had to
> >> > apply today.
> >> >
> >> > I have applied the following patch for today.
> >> >
> >> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> >> > Subject: [PATCH] drm/locking: fix for name conflict
> >> >
> >> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > ---
> >> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> >> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> >> > index 4d32b61fa1fd..ee36dd20900d 100644
> >> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> >> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> >> > @@ -79,7 +79,7 @@
> >> > static DEFINE_WW_CLASS(crtc_ww_class);
> >> >
> >> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> >> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> >> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > unsigned long entries[8];
> >> > unsigned int n;
> >> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> >> > kfree(buf);
> >> > }
> >> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> >> > -static depot_stack_handle_t __stack_depot_save(void)
> >> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > return 0;
> >> > }
> >> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> >> > ret = 0;
> >> > } else if (ret == -EDEADLK) {
> >> > ctx->contended = lock;
> >> > - ctx->stack_depot = __stack_depot_save();
> >> > + ctx->stack_depot = __drm_stack_depot_save();
> >> > }
> >> >
> >> > return ret;
> >>
> >> This has reappeared today. I don't know what happened to the drm-misc
> >> tree over the weeked :-(
> >>
> >> I have reapplied the above fix.
> >
> > So the above drm-misc commit is now in the drm tree, but its fix up
> > commit vanished from the drm-misc tree over the past weekend :-(
>
> Cc: drm-misc maintainers.
>
> We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
> drm-misc-next-fixes during the merge window. This is because
> drm-misc-next already starts accumulating stuff that's headed to one
> release later, e.g. currently v5.17. I think that's part of the reason.
Indeed
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> There's still something funny going on, because the drm-misc-next pull
> request [1] isn't part of the drm pull request for v5.16 [2]. Is there
> going to be another drm pull?
The last drm-misc-next PR for some reason didn't got logged into
patchwork, and Dave missed it.
We found out yesterday, and he pulled it today so I assume there will be
a second PR with that last PR and today's drm-misc-next-fixes PR.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-05 11:57 ` Maxime Ripard
0 siblings, 0 replies; 38+ messages in thread
From: Maxime Ripard @ 2021-11-05 11:57 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 5101 bytes --]
Hi,
On Fri, Nov 05, 2021 at 01:03:43PM +0200, Jani Nikula wrote:
> On Fri, 05 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > On Mon, 1 Nov 2021 19:42:23 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> On Fri, 15 Oct 2021 20:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> >
> >> > After merging the drm-misc tree, today's linux-next build (arm
> >> > multi_v7_defconfig) failed like this:
> >> >
> >> > drivers/gpu/drm/drm_modeset_lock.c:111:29: error: conflicting types for '__stack_depot_save'
> >> > 111 | static depot_stack_handle_t __stack_depot_save(void)
> >> > | ^~~~~~~~~~~~~~~~~~
> >> > In file included from include/linux/page_ext.h:7,
> >> > from include/linux/mm.h:25,
> >> > from include/linux/kallsyms.h:13,
> >> > from include/linux/bpf.h:20,
> >> > from include/linux/bpf-cgroup.h:5,
> >> > from include/linux/cgroup-defs.h:22,
> >> > from include/linux/cgroup.h:28,
> >> > from include/linux/memcontrol.h:13,
> >> > from include/linux/swap.h:9,
> >> > from include/linux/suspend.h:5,
> >> > from include/linux/regulator/consumer.h:35,
> >> > from include/linux/i2c.h:18,
> >> > from include/drm/drm_crtc.h:28,
> >> > from include/drm/drm_atomic.h:31,
> >> > from drivers/gpu/drm/drm_modeset_lock.c:24:
> >> > include/linux/stackdepot.h:18:22: note: previous declaration of '__stack_depot_save' was here
> >> > 18 | depot_stack_handle_t __stack_depot_save(unsigned long *entries,
> >> > | ^~~~~~~~~~~~~~~~~~
> >> >
> >> > Caused by commit
> >> >
> >> > cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> >
> >> > This may only have been revealed because of another fix I have had to
> >> > apply today.
> >> >
> >> > I have applied the following patch for today.
> >> >
> >> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > Date: Fri, 15 Oct 2021 20:17:52 +1100
> >> > Subject: [PATCH] drm/locking: fix for name conflict
> >> >
> >> > Fixes: cd06ab2fd48f ("drm/locking: add backtrace for locking contended locks without backoff")
> >> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> >> > ---
> >> > drivers/gpu/drm/drm_modeset_lock.c | 6 +++---
> >> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >> >
> >> > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c
> >> > index 4d32b61fa1fd..ee36dd20900d 100644
> >> > --- a/drivers/gpu/drm/drm_modeset_lock.c
> >> > +++ b/drivers/gpu/drm/drm_modeset_lock.c
> >> > @@ -79,7 +79,7 @@
> >> > static DEFINE_WW_CLASS(crtc_ww_class);
> >> >
> >> > #if IS_ENABLED(CONFIG_DRM_DEBUG_MODESET_LOCK)
> >> > -static noinline depot_stack_handle_t __stack_depot_save(void)
> >> > +static noinline depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > unsigned long entries[8];
> >> > unsigned int n;
> >> > @@ -108,7 +108,7 @@ static void __stack_depot_print(depot_stack_handle_t stack_depot)
> >> > kfree(buf);
> >> > }
> >> > #else /* CONFIG_DRM_DEBUG_MODESET_LOCK */
> >> > -static depot_stack_handle_t __stack_depot_save(void)
> >> > +static depot_stack_handle_t __drm_stack_depot_save(void)
> >> > {
> >> > return 0;
> >> > }
> >> > @@ -317,7 +317,7 @@ static inline int modeset_lock(struct drm_modeset_lock *lock,
> >> > ret = 0;
> >> > } else if (ret == -EDEADLK) {
> >> > ctx->contended = lock;
> >> > - ctx->stack_depot = __stack_depot_save();
> >> > + ctx->stack_depot = __drm_stack_depot_save();
> >> > }
> >> >
> >> > return ret;
> >>
> >> This has reappeared today. I don't know what happened to the drm-misc
> >> tree over the weeked :-(
> >>
> >> I have reapplied the above fix.
> >
> > So the above drm-misc commit is now in the drm tree, but its fix up
> > commit vanished from the drm-misc tree over the past weekend :-(
>
> Cc: drm-misc maintainers.
>
> We normally point drm-misc/for-linux-next at drm-misc-next, *except* to
> drm-misc-next-fixes during the merge window. This is because
> drm-misc-next already starts accumulating stuff that's headed to one
> release later, e.g. currently v5.17. I think that's part of the reason.
Indeed
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> There's still something funny going on, because the drm-misc-next pull
> request [1] isn't part of the drm pull request for v5.16 [2]. Is there
> going to be another drm pull?
The last drm-misc-next PR for some reason didn't got logged into
patchwork, and Dave missed it.
We found out yesterday, and he pulled it today so I assume there will be
a second PR with that last PR and today's drm-misc-next-fixes PR.
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-05 11:03 ` Jani Nikula
(?)
@ 2021-11-06 2:33 ` Stephen Rothwell
-1 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-06 2:33 UTC (permalink / raw)
To: Jani Nikula
Cc: Dave Airlie, Daniel Vetter, Intel Graphics, DRI,
Linux Kernel Mailing List, Linux Next Mailing List,
Thomas Zimmermann, Maarten Lankhorst, Maxime Ripard
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
Hi Jani,
On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
Please do so as builds will start failing otherwise :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-06 2:33 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-06 2:33 UTC (permalink / raw)
To: Jani Nikula
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
Hi Jani,
On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
Please do so as builds will start failing otherwise :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-06 2:33 ` Stephen Rothwell
0 siblings, 0 replies; 38+ messages in thread
From: Stephen Rothwell @ 2021-11-06 2:33 UTC (permalink / raw)
To: Jani Nikula
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Maxime Ripard, Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
Hi Jani,
On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>
> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> __stack_depot_* name conflict") to drm-misc-next-fixes.
Please do so as builds will start failing otherwise :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-06 2:33 ` Stephen Rothwell
(?)
@ 2021-11-09 7:40 ` Jani Nikula
-1 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-09 7:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann, Maxime Ripard, Maarten Lankhorst
On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jani,
>
> On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>>
>> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> Please do so as builds will start failing otherwise :-(
Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-09 7:40 ` Jani Nikula
0 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-09 7:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jani,
>
> On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>>
>> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> Please do so as builds will start failing otherwise :-(
Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-09 7:40 ` Jani Nikula
0 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-09 7:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Maxime Ripard, Thomas Zimmermann
On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jani,
>
> On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>>
>> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> __stack_depot_* name conflict") to drm-misc-next-fixes.
>
> Please do so as builds will start failing otherwise :-(
Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-09 7:40 ` Jani Nikula
(?)
@ 2021-11-09 9:16 ` Daniel Vetter
-1 siblings, 0 replies; 38+ messages in thread
From: Daniel Vetter @ 2021-11-09 9:16 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann, Maxime Ripard, Maarten Lankhorst
On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Jani,
> >
> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
> >>
> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
> >
> > Please do so as builds will start failing otherwise :-(
>
> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
Yeah just do, for drm-misc this is considered in committer purview. I
think we should add a section to the docs about "What if a patch is in the
wrong branch" which tells you to just cherry-pick -x or whatever.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-09 9:16 ` Daniel Vetter
0 siblings, 0 replies; 38+ messages in thread
From: Daniel Vetter @ 2021-11-09 9:16 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Jani,
> >
> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
> >>
> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
> >
> > Please do so as builds will start failing otherwise :-(
>
> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
Yeah just do, for drm-misc this is considered in committer purview. I
think we should add a section to the docs about "What if a patch is in the
wrong branch" which tells you to just cherry-pick -x or whatever.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-09 9:16 ` Daniel Vetter
0 siblings, 0 replies; 38+ messages in thread
From: Daniel Vetter @ 2021-11-09 9:16 UTC (permalink / raw)
To: Jani Nikula
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Maxime Ripard, Thomas Zimmermann
On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Jani,
> >
> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
> >>
> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
> >
> > Please do so as builds will start failing otherwise :-(
>
> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
Yeah just do, for drm-misc this is considered in committer purview. I
think we should add a section to the docs about "What if a patch is in the
wrong branch" which tells you to just cherry-pick -x or whatever.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
2021-11-09 9:16 ` Daniel Vetter
(?)
@ 2021-11-09 11:09 ` Jani Nikula
-1 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-09 11:09 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann, Maxime Ripard, Maarten Lankhorst
On Tue, 09 Nov 2021, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
>> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > Hi Jani,
>> >
>> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>> >>
>> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
>> >
>> > Please do so as builds will start failing otherwise :-(
>>
>> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
>
> Yeah just do, for drm-misc this is considered in committer purview. I
> think we should add a section to the docs about "What if a patch is in the
> wrong branch" which tells you to just cherry-pick -x or whatever.
Done.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: linux-next: build failure after merge of the drm-misc tree
@ 2021-11-09 11:09 ` Jani Nikula
0 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-09 11:09 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Thomas Zimmermann
On Tue, 09 Nov 2021, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
>> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > Hi Jani,
>> >
>> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>> >>
>> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
>> >
>> > Please do so as builds will start failing otherwise :-(
>>
>> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
>
> Yeah just do, for drm-misc this is considered in committer purview. I
> think we should add a section to the docs about "What if a patch is in the
> wrong branch" which tells you to just cherry-pick -x or whatever.
Done.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree
@ 2021-11-09 11:09 ` Jani Nikula
0 siblings, 0 replies; 38+ messages in thread
From: Jani Nikula @ 2021-11-09 11:09 UTC (permalink / raw)
To: Daniel Vetter
Cc: Stephen Rothwell, Dave Airlie, Daniel Vetter, Intel Graphics,
Linux Kernel Mailing List, DRI, Linux Next Mailing List,
Maxime Ripard, Thomas Zimmermann
On Tue, 09 Nov 2021, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Tue, Nov 09, 2021 at 09:40:08AM +0200, Jani Nikula wrote:
>> On Sat, 06 Nov 2021, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > Hi Jani,
>> >
>> > On Fri, 05 Nov 2021 13:03:43 +0200 Jani Nikula <jani.nikula@intel.com> wrote:
>> >>
>> >> I probably should have pushed c4f08d7246a5 ("drm/locking: fix
>> >> __stack_depot_* name conflict") to drm-misc-next-fixes.
>> >
>> > Please do so as builds will start failing otherwise :-(
>>
>> Thomas/Maxime/Maarten, okay to cherry-pick that to drm-misc-next-fixes?
>
> Yeah just do, for drm-misc this is considered in committer purview. I
> think we should add a section to the docs about "What if a patch is in the
> wrong branch" which tells you to just cherry-pick -x or whatever.
Done.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
2022-04-06 0:50 Stephen Rothwell
@ 2022-04-06 3:01 ` Patchwork
0 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2022-04-06 3:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/102234/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
e9f5f04870a7 linux-next: build failure after merge of the drm-misc tree
-:18: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#18:
49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
-:18: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")'
#18:
49956b505c53 ("drm/panel: Add panel driver for NewVision NV3052C based LCDs")
-:22: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 2cbfa2128662 ("spi: make remove callback a void function")'
#22:
2cbfa2128662 ("spi: make remove callback a void function")
total: 2 errors, 1 warnings, 0 checks, 16 lines checked
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
2020-11-02 1:43 Stephen Rothwell
@ 2020-11-02 1:59 ` Patchwork
0 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2020-11-02 1:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/83323/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
667a901ef419 linux-next: build failure after merge of the drm-misc tree
-:26: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")'
#26:
abe420bfae52 ("swiotlb: Introduce swiotlb_max_mapping_size()")
-:30: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 4dbafbd30aef ("drm/nouveu: fix swiotlb include")'
#30:
4dbafbd30aef ("drm/nouveu: fix swiotlb include")
total: 2 errors, 0 warnings, 0 checks, 9 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
2020-06-17 0:59 Stephen Rothwell
@ 2020-06-17 1:46 ` Patchwork
0 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2020-06-17 1:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/78444/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
5bf216c35bb2 linux-next: build failure after merge of the drm-misc tree
-:19: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")'
#19:
ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")
-:23: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")'
#23:
fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")
total: 2 errors, 0 warnings, 0 checks, 8 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
2020-04-20 3:01 Stephen Rothwell
@ 2020-04-29 10:11 ` Patchwork
0 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2020-04-29 10:11 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/76709/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
4cb00cc7b2f7 linux-next: build failure after merge of the drm-misc tree
-:11: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#11:
> On Mon, 20 Apr 2020 13:01:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
-:25: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")'
#25:
>> a07a63b0e24d ("video: fbdev: controlfb: add COMPILE_TEST support")
-:63: ERROR:MISSING_SIGN_OFF: Missing Signed-off-by: line(s)
total: 2 errors, 1 warnings, 0 checks, 16 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: build failure after merge of the drm-misc tree
2019-12-16 1:23 Stephen Rothwell
@ 2019-12-16 1:41 ` Patchwork
0 siblings, 0 replies; 38+ messages in thread
From: Patchwork @ 2019-12-16 1:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/70958/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
ccba0d4a341c linux-next: build failure after merge of the drm-misc tree
-:21: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 6aa192698089 ("drm/bridge: Add Analogix anx6345 support")'
#21:
6aa192698089 ("drm/bridge: Add Analogix anx6345 support")
-:47: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#47: FILE: drivers/gpu/drm/bridge/analogix/analogix-anx6345.c:739:
+ anx6345->i2c_clients[i] = i2c_new_dummy_device(client->adapter,
anx6345_i2c_addresses[i] >> 1);
total: 1 errors, 0 warnings, 1 checks, 16 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2022-04-06 3:01 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 9:26 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2021-10-15 9:26 ` [Intel-gfx] " Stephen Rothwell
2021-10-15 9:56 ` Jani Nikula
2021-10-15 9:56 ` [Intel-gfx] " Jani Nikula
2021-10-15 10:23 ` Stephen Rothwell
2021-10-15 10:23 ` [Intel-gfx] " Stephen Rothwell
2021-10-15 12:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-10-15 12:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-10-15 19:04 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-11-01 8:42 ` Stephen Rothwell
2021-11-01 8:42 ` [Intel-gfx] " Stephen Rothwell
2021-11-01 8:42 ` Stephen Rothwell
2021-11-05 6:15 ` Stephen Rothwell
2021-11-05 6:15 ` [Intel-gfx] " Stephen Rothwell
2021-11-05 6:15 ` Stephen Rothwell
2021-11-05 11:03 ` Jani Nikula
2021-11-05 11:03 ` [Intel-gfx] " Jani Nikula
2021-11-05 11:03 ` Jani Nikula
2021-11-05 11:57 ` Maxime Ripard
2021-11-05 11:57 ` [Intel-gfx] " Maxime Ripard
2021-11-05 11:57 ` Maxime Ripard
2021-11-06 2:33 ` Stephen Rothwell
2021-11-06 2:33 ` [Intel-gfx] " Stephen Rothwell
2021-11-06 2:33 ` Stephen Rothwell
2021-11-09 7:40 ` Jani Nikula
2021-11-09 7:40 ` [Intel-gfx] " Jani Nikula
2021-11-09 7:40 ` Jani Nikula
2021-11-09 9:16 ` Daniel Vetter
2021-11-09 9:16 ` [Intel-gfx] " Daniel Vetter
2021-11-09 9:16 ` Daniel Vetter
2021-11-09 11:09 ` Jani Nikula
2021-11-09 11:09 ` [Intel-gfx] " Jani Nikula
2021-11-09 11:09 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2022-04-06 0:50 Stephen Rothwell
2022-04-06 3:01 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-11-02 1:43 Stephen Rothwell
2020-11-02 1:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-06-17 0:59 Stephen Rothwell
2020-06-17 1:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-04-20 3:01 Stephen Rothwell
2020-04-29 10:11 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-12-16 1:23 Stephen Rothwell
2019-12-16 1:41 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.