* [Intel-gfx] linux-next: build failure after merge of the drm tree
@ 2023-01-19 2:12 Stephen Rothwell
2023-01-19 2:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 16+ messages in thread
From: Stephen Rothwell @ 2023-01-19 2:12 UTC (permalink / raw)
To: Dave Airlie, Daniel Vetter
Cc: Intel Graphics, Linux Next Mailing List, DRI, Thomas Zimmermann,
Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 3631 bytes --]
Hi all,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from drivers/gpu/drm/drm_fb_helper.c:33:
drivers/gpu/drm/drm_fb_helper.c: In function 'drm_fb_helper_single_fb_probe':
drivers/gpu/drm/drm_fb_helper.c:1968:24: error: 'dev' undeclared (first use in this function); did you mean 'cdev'?
1968 | if (dev_is_pci(dev->dev))
| ^~~
include/linux/pci.h:1151:25: note: in definition of macro 'dev_is_pci'
1151 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type)
| ^
drivers/gpu/drm/drm_fb_helper.c:1968:24: note: each undeclared identifier is reported only once for each function it appears in
1968 | if (dev_is_pci(dev->dev))
| ^~~
include/linux/pci.h:1151:25: note: in definition of macro 'dev_is_pci'
1151 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type)
| ^
In file included from include/linux/atomic/atomic-instrumented.h:20,
from include/linux/atomic.h:82,
from include/linux/console.h:17,
from drivers/gpu/drm/drm_fb_helper.c:32:
include/linux/compiler_types.h:299:27: error: expression in static assertion is not an integer
299 | #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert'
78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
| ^~~~
include/linux/container_of.h:20:9: note: in expansion of macro 'static_assert'
20 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
| ^~~~~~~~~~~~~
include/linux/container_of.h:20:23: note: in expansion of macro '__same_type'
20 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
| ^~~~~~~~~~~
include/linux/pci.h:541:23: note: in expansion of macro 'container_of'
541 | #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
| ^~~~~~~~~~~~
drivers/gpu/drm/drm_fb_helper.c:1969:46: note: in expansion of macro 'to_pci_dev'
1969 | vga_switcheroo_client_fb_set(to_pci_dev(dev->dev), fb_helper->info);
| ^~~~~~~~~~
Caused by commit
cff84bac9922 ("drm/fh-helper: Split fbdev single-probe helper")
interacting with commit
d1d5101452ab ("drm/fb-helper: Set framebuffer for vga-switcheroo clients")
from the drm-misc-fixes tree.
I have added the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jan 2023 12:42:56 +1100
Subject: [PATCH] fix up for "drm/fb-helper: Set framebuffer for vga-switcheroo clients"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/drm_fb_helper.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 97049a26fca2..5e445c61252d 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1942,6 +1942,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
int preferred_bpp)
{
struct drm_client_dev *client = &fb_helper->client;
+ struct drm_device *dev = fb_helper->dev;
struct drm_fb_helper_surface_size sizes;
int ret;
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for linux-next: build failure after merge of the drm tree
2023-01-19 2:12 [Intel-gfx] linux-next: build failure after merge of the drm tree Stephen Rothwell
@ 2023-01-19 2:34 ` Patchwork
2023-01-19 3:04 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2023-01-19 2:34 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm tree
URL : https://patchwork.freedesktop.org/series/113069/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: build failure after merge of the drm tree
2023-01-19 2:12 [Intel-gfx] linux-next: build failure after merge of the drm tree Stephen Rothwell
2023-01-19 2:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
@ 2023-01-19 3:04 ` Patchwork
2023-01-19 22:15 ` [Intel-gfx] " Rodrigo Vivi
2023-01-20 1:35 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2023-01-19 3:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 6486 bytes --]
== Series Details ==
Series: linux-next: build failure after merge of the drm tree
URL : https://patchwork.freedesktop.org/series/113069/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12605 -> Patchwork_113069v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/index.html
Participating hosts (43 -> 43)
------------------------------
Additional (1): fi-kbl-soraka
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_113069v1:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_exec_suspend@basic-s0@lmem0:
- {bat-dg2-11}: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/bat-dg2-11/igt@gem_exec_suspend@basic-s0@lmem0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/bat-dg2-11/igt@gem_exec_suspend@basic-s0@lmem0.html
Known issues
------------
Here are the changes found in Patchwork_113069v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_gttfill@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271]) +15 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-kbl-soraka/igt@gem_exec_gttfill@basic.html
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][6] ([i915#1886])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@guc_multi_lrc:
- fi-kbl-soraka: NOTRUN -> [INCOMPLETE][7] ([i915#7640])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-kbl-soraka/igt@i915_selftest@live@guc_multi_lrc.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-rkl-guc: NOTRUN -> [SKIP][8] ([i915#7828])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-rkl-guc/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [DMESG-FAIL][9] ([i915#5334]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@gt_pm:
- {bat-rpls-2}: [DMESG-FAIL][11] ([i915#4258]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/bat-rpls-2/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@hangcheck:
- fi-rkl-guc: [INCOMPLETE][13] ([i915#4983]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/fi-rkl-guc/igt@i915_selftest@live@hangcheck.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-rkl-guc/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@reset:
- {bat-rpls-2}: [DMESG-FAIL][15] ([i915#4983]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/bat-rpls-2/igt@i915_selftest@live@reset.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/bat-rpls-2/igt@i915_selftest@live@reset.html
* igt@i915_selftest@live@slpc:
- {bat-rpls-1}: [DMESG-FAIL][17] ([i915#6367]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/bat-rpls-1/igt@i915_selftest@live@slpc.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/bat-rpls-1/igt@i915_selftest@live@slpc.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size:
- fi-bsw-n3050: [FAIL][19] ([i915#6298]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#7640]: https://gitlab.freedesktop.org/drm/intel/issues/7640
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
Build changes
-------------
* Linux: CI_DRM_12605 -> Patchwork_113069v1
CI-20190529: 20190529
CI_DRM_12605: 1e863b59056127f55822b29a8f0cabf476806979 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7123: 2b29e8ac07fbcfadc48b9d60e4d736a6e3b289ab @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113069v1: 1e863b59056127f55822b29a8f0cabf476806979 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/index.html
[-- Attachment #2: Type: text/html, Size: 7487 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm tree
2023-01-19 2:12 [Intel-gfx] linux-next: build failure after merge of the drm tree Stephen Rothwell
2023-01-19 2:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2023-01-19 3:04 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2023-01-19 22:15 ` Rodrigo Vivi
2023-01-20 1:35 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 0 replies; 16+ messages in thread
From: Rodrigo Vivi @ 2023-01-19 22:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List, DRI,
Linux Next Mailing List, Thomas Zimmermann, Dave Airlie
On Thu, Jan 19, 2023 at 01:12:22PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drivers/gpu/drm/drm_fb_helper.c:33:
> drivers/gpu/drm/drm_fb_helper.c: In function 'drm_fb_helper_single_fb_probe':
> drivers/gpu/drm/drm_fb_helper.c:1968:24: error: 'dev' undeclared (first use in this function); did you mean 'cdev'?
It's a silent conflict of
cff84bac9922 ("drm/fh-helper: Split fbdev single-probe helper")
with
d1d5101452ab ("drm/fb-helper: Set framebuffer for vga-switcheroo clients")
The resolution is to reintroduce the dev declaration there in
drm_fb_helper_single_fb_probe()
+ struct drm_device *dev = fb_helper->dev;
I hope it helps.
Thanks,
Rodrigo.
> 1968 | if (dev_is_pci(dev->dev))
> | ^~~
> include/linux/pci.h:1151:25: note: in definition of macro 'dev_is_pci'
> 1151 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type)
> | ^
> drivers/gpu/drm/drm_fb_helper.c:1968:24: note: each undeclared identifier is reported only once for each function it appears in
> 1968 | if (dev_is_pci(dev->dev))
> | ^~~
> include/linux/pci.h:1151:25: note: in definition of macro 'dev_is_pci'
> 1151 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type)
> | ^
> In file included from include/linux/atomic/atomic-instrumented.h:20,
> from include/linux/atomic.h:82,
> from include/linux/console.h:17,
> from drivers/gpu/drm/drm_fb_helper.c:32:
> include/linux/compiler_types.h:299:27: error: expression in static assertion is not an integer
> 299 | #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/build_bug.h:78:56: note: in definition of macro '__static_assert'
> 78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
> | ^~~~
> include/linux/container_of.h:20:9: note: in expansion of macro 'static_assert'
> 20 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
> | ^~~~~~~~~~~~~
> include/linux/container_of.h:20:23: note: in expansion of macro '__same_type'
> 20 | static_assert(__same_type(*(ptr), ((type *)0)->member) || \
> | ^~~~~~~~~~~
> include/linux/pci.h:541:23: note: in expansion of macro 'container_of'
> 541 | #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
> | ^~~~~~~~~~~~
> drivers/gpu/drm/drm_fb_helper.c:1969:46: note: in expansion of macro 'to_pci_dev'
> 1969 | vga_switcheroo_client_fb_set(to_pci_dev(dev->dev), fb_helper->info);
> | ^~~~~~~~~~
>
> Caused by commit
>
> cff84bac9922 ("drm/fh-helper: Split fbdev single-probe helper")
>
> interacting with commit
>
> d1d5101452ab ("drm/fb-helper: Set framebuffer for vga-switcheroo clients")
>
> from the drm-misc-fixes tree.
>
> I have added the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 19 Jan 2023 12:42:56 +1100
> Subject: [PATCH] fix up for "drm/fb-helper: Set framebuffer for vga-switcheroo clients"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/drm_fb_helper.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 97049a26fca2..5e445c61252d 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -1942,6 +1942,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
> int preferred_bpp)
> {
> struct drm_client_dev *client = &fb_helper->client;
> + struct drm_device *dev = fb_helper->dev;
> struct drm_fb_helper_surface_size sizes;
> int ret;
>
> --
> 2.35.1
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for linux-next: build failure after merge of the drm tree
2023-01-19 2:12 [Intel-gfx] linux-next: build failure after merge of the drm tree Stephen Rothwell
` (2 preceding siblings ...)
2023-01-19 22:15 ` [Intel-gfx] " Rodrigo Vivi
@ 2023-01-20 1:35 ` Patchwork
3 siblings, 0 replies; 16+ messages in thread
From: Patchwork @ 2023-01-20 1:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 15592 bytes --]
== Series Details ==
Series: linux-next: build failure after merge of the drm tree
URL : https://patchwork.freedesktop.org/series/113069/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12605_full -> Patchwork_113069v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/index.html
Participating hosts (12 -> 10)
------------------------------
Missing (2): pig-skl-6260u pig-kbl-iris
Known issues
------------
Here are the changes found in Patchwork_113069v1_full that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@api_intel_bb@object-reloc-keep-cache:
- {shard-rkl}: [SKIP][1] ([i915#3281]) -> [PASS][2] +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-1/igt@api_intel_bb@object-reloc-keep-cache.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-5/igt@api_intel_bb@object-reloc-keep-cache.html
* igt@drm_fdinfo@virtual-idle:
- {shard-rkl}: [FAIL][3] ([i915#7742]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-4/igt@drm_fdinfo@virtual-idle.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-2/igt@drm_fdinfo@virtual-idle.html
* igt@fbdev@pan:
- {shard-rkl}: [SKIP][5] ([i915#2582]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-2/igt@fbdev@pan.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-6/igt@fbdev@pan.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][7] ([i915#2842]) -> [PASS][8] +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-glk8/igt@gem_exec_fair@basic-pace-share@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-glk9/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- {shard-rkl}: [FAIL][9] ([i915#2842]) -> [PASS][10] +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-6/igt@gem_exec_fair@basic-pace@rcs0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-5/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_mmap_gtt@coherency:
- {shard-rkl}: [SKIP][11] ([fdo#111656]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-6/igt@gem_mmap_gtt@coherency.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-5/igt@gem_mmap_gtt@coherency.html
* igt@gem_partial_pwrite_pread@reads-uncached:
- {shard-rkl}: [SKIP][13] ([i915#3282]) -> [PASS][14] +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-1/igt@gem_partial_pwrite_pread@reads-uncached.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-5/igt@gem_partial_pwrite_pread@reads-uncached.html
* igt@i915_pm_rc6_residency@rc6-idle@vcs0:
- {shard-rkl}: [WARN][15] ([i915#2681]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-5/igt@i915_pm_rc6_residency@rc6-idle@vcs0.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-6/igt@i915_pm_rc6_residency@rc6-idle@vcs0.html
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-rkl}: [SKIP][17] ([i915#1397]) -> [PASS][18] +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-2/igt@i915_pm_rpm@dpms-lpsp.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-6/igt@i915_pm_rpm@dpms-lpsp.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [FAIL][19] ([i915#72]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-glk3/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-glk8/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][21] ([i915#79]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2.html
* igt@kms_frontbuffer_tracking@psr-modesetfrombusy:
- {shard-rkl}: [SKIP][23] ([i915#1849] / [i915#4098]) -> [PASS][24] +15 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-3/igt@kms_frontbuffer_tracking@psr-modesetfrombusy.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-modesetfrombusy.html
* igt@kms_plane@plane-position-hole@pipe-b-planes:
- {shard-rkl}: [SKIP][25] ([i915#1849]) -> [PASS][26] +5 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-5/igt@kms_plane@plane-position-hole@pipe-b-planes.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-6/igt@kms_plane@plane-position-hole@pipe-b-planes.html
* igt@kms_psr@primary_render:
- {shard-rkl}: [SKIP][27] ([i915#1072]) -> [PASS][28] +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-2/igt@kms_psr@primary_render.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-6/igt@kms_psr@primary_render.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- {shard-rkl}: [SKIP][29] ([i915#1845] / [i915#4098]) -> [PASS][30] +21 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-3/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-6/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
* igt@prime_vgem@basic-read:
- {shard-rkl}: [SKIP][31] ([fdo#109295] / [i915#3291] / [i915#3708]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-rkl-1/igt@prime_vgem@basic-read.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-rkl-5/igt@prime_vgem@basic-read.html
* igt@sysfs_timeslice_duration@timeout@vcs1:
- {shard-dg1}: [FAIL][33] ([i915#1755]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12605/shard-dg1-15/igt@sysfs_timeslice_duration@timeout@vcs1.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/shard-dg1-18/igt@sysfs_timeslice_duration@timeout@vcs1.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2232]: https://gitlab.freedesktop.org/drm/intel/issues/2232
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3825]: https://gitlab.freedesktop.org/drm/intel/issues/3825
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5507]: https://gitlab.freedesktop.org/drm/intel/issues/5507
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6412]: https://gitlab.freedesktop.org/drm/intel/issues/6412
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7582]: https://gitlab.freedesktop.org/drm/intel/issues/7582
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12605 -> Patchwork_113069v1
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12605: 1e863b59056127f55822b29a8f0cabf476806979 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7123: 2b29e8ac07fbcfadc48b9d60e4d736a6e3b289ab @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113069v1: 1e863b59056127f55822b29a8f0cabf476806979 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113069v1/index.html
[-- Attachment #2: Type: text/html, Size: 10167 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <20210820123348.6535a87e@canb.auug.org.au>]
[parent not found: <20210108115518.2b3fdf58@canb.auug.org.au>]
* Re: [Intel-gfx] linux-next: build failure after merge of the drm tree
[not found] <20210108115518.2b3fdf58@canb.auug.org.au>
@ 2021-01-08 1:25 ` Stephen Rothwell
2021-01-10 23:56 ` Stephen Rothwell
0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2021-01-08 1:25 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics
Cc: Dave Airlie, Tomi Valkeinen, Sebastian Reichel, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 727 bytes --]
Hi all,
On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> error: the following would cause module name conflict:
> drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko
> drivers/gpu/drm/panel/panel-dsi-cm.ko
>
> Maybe caused by commit
>
> cf64148abcfd ("drm/panel: Move OMAP's DSI command mode panel driver")
>
> I have used the drm tree from next-20210107 for today.
This has affected the drm-misc tree as well (since it merged in the drm
tree).
I have used the drm-misc tree from next-20210107 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm tree
2021-01-08 1:25 ` Stephen Rothwell
@ 2021-01-10 23:56 ` Stephen Rothwell
2021-01-18 0:59 ` Stephen Rothwell
0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2021-01-10 23:56 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi
Cc: Dave Airlie, Tomi Valkeinen, Sebastian Reichel, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 932 bytes --]
Hi all,
On Fri, 8 Jan 2021 12:25:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > error: the following would cause module name conflict:
> > drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko
> > drivers/gpu/drm/panel/panel-dsi-cm.ko
> >
> > Maybe caused by commit
> >
> > cf64148abcfd ("drm/panel: Move OMAP's DSI command mode panel driver")
> >
> > I have used the drm tree from next-20210107 for today.
>
> This has affected the drm-misc tree as well (since it merged in the drm
> tree).
>
> I have used the drm-misc tree from next-20210107 for today.
And now the drm-intel tree.
I have used the drm-intel tree from next-20210108 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm tree
2021-01-10 23:56 ` Stephen Rothwell
@ 2021-01-18 0:59 ` Stephen Rothwell
2021-01-18 1:06 ` Dave Airlie
0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2021-01-18 0:59 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi
Cc: Dave Airlie, Tomi Valkeinen, Sebastian Reichel, DRI,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 1132 bytes --]
Hi all,
On Mon, 11 Jan 2021 10:56:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 8 Jan 2021 12:25:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > >
> > > error: the following would cause module name conflict:
> > > drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko
> > > drivers/gpu/drm/panel/panel-dsi-cm.ko
> > >
> > > Maybe caused by commit
> > >
> > > cf64148abcfd ("drm/panel: Move OMAP's DSI command mode panel driver")
> > >
> > > I have used the drm tree from next-20210107 for today.
> >
> > This has affected the drm-misc tree as well (since it merged in the drm
> > tree).
> >
> > I have used the drm-misc tree from next-20210107 for today.
>
> And now the drm-intel tree.
>
> I have used the drm-intel tree from next-20210108 for today.
This is still affecting the drm and drm-intel trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm tree
2021-01-18 0:59 ` Stephen Rothwell
@ 2021-01-18 1:06 ` Dave Airlie
2021-01-20 12:12 ` Daniel Vetter
0 siblings, 1 reply; 16+ messages in thread
From: Dave Airlie @ 2021-01-18 1:06 UTC (permalink / raw)
To: Stephen Rothwell, Maarten Lankhorst
Cc: Dave Airlie, Daniel Vetter, Intel Graphics, Sebastian Reichel,
Linux Kernel Mailing List, Linux Next Mailing List,
Tomi Valkeinen, DRI
On Mon, 18 Jan 2021 at 10:59, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Mon, 11 Jan 2021 10:56:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Fri, 8 Jan 2021 12:25:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> > > > failed like this:
> > > >
> > > > error: the following would cause module name conflict:
> > > > drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko
> > > > drivers/gpu/drm/panel/panel-dsi-cm.ko
> > > >
> > > > Maybe caused by commit
> > > >
> > > > cf64148abcfd ("drm/panel: Move OMAP's DSI command mode panel driver")
> > > >
> > > > I have used the drm tree from next-20210107 for today.
> > >
> > > This has affected the drm-misc tree as well (since it merged in the drm
> > > tree).
> > >
> > > I have used the drm-misc tree from next-20210107 for today.
> >
> > And now the drm-intel tree.
> >
> > I have used the drm-intel tree from next-20210108 for today.
>
> This is still affecting the drm and drm-intel trees.
I think the fix for this is in drm-misc-next, Maarten can you send me
a -next PR to fix this?
Dave.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm tree
2021-01-18 1:06 ` Dave Airlie
@ 2021-01-20 12:12 ` Daniel Vetter
2021-01-20 20:44 ` Stephen Rothwell
0 siblings, 1 reply; 16+ messages in thread
From: Daniel Vetter @ 2021-01-20 12:12 UTC (permalink / raw)
To: Dave Airlie
Cc: Stephen Rothwell, Dave Airlie, Intel Graphics, Sebastian Reichel,
Linux Kernel Mailing List, Linux Next Mailing List,
Tomi Valkeinen, DRI
On Mon, Jan 18, 2021 at 2:06 AM Dave Airlie <airlied@gmail.com> wrote:
>
> On Mon, 18 Jan 2021 at 10:59, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > On Mon, 11 Jan 2021 10:56:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > On Fri, 8 Jan 2021 12:25:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > On Fri, 8 Jan 2021 11:55:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> > > > > failed like this:
> > > > >
> > > > > error: the following would cause module name conflict:
> > > > > drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.ko
> > > > > drivers/gpu/drm/panel/panel-dsi-cm.ko
> > > > >
> > > > > Maybe caused by commit
> > > > >
> > > > > cf64148abcfd ("drm/panel: Move OMAP's DSI command mode panel driver")
> > > > >
> > > > > I have used the drm tree from next-20210107 for today.
> > > >
> > > > This has affected the drm-misc tree as well (since it merged in the drm
> > > > tree).
> > > >
> > > > I have used the drm-misc tree from next-20210107 for today.
> > >
> > > And now the drm-intel tree.
> > >
> > > I have used the drm-intel tree from next-20210108 for today.
> >
> > This is still affecting the drm and drm-intel trees.
>
> I think the fix for this is in drm-misc-next, Maarten can you send me
> a -next PR to fix this?
I've pulled drm-misc-next into drm-next now, so as long as all other
drm trees are merged after drm, this should be solved now.
drm-intel-next also has their msm build breakage fixed (I acked the
patch already), so hopefully we should be all clean again.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [Intel-gfx] linux-next: build failure after merge of the drm tree
2021-01-20 12:12 ` Daniel Vetter
@ 2021-01-20 20:44 ` Stephen Rothwell
0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2021-01-20 20:44 UTC (permalink / raw)
To: Daniel Vetter
Cc: Dave Airlie, Intel Graphics, Sebastian Reichel,
Linux Kernel Mailing List, Linux Next Mailing List,
Tomi Valkeinen, DRI
[-- Attachment #1.1: Type: text/plain, Size: 411 bytes --]
Hi Daniel,
On Wed, 20 Jan 2021 13:12:21 +0100 Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> I've pulled drm-misc-next into drm-next now, so as long as all other
> drm trees are merged after drm, this should be solved now.
> drm-intel-next also has their msm build breakage fixed (I acked the
> patch already), so hopefully we should be all clean again.
Thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Intel-gfx] linux-next: build failure after merge of the drm tree
@ 2020-12-09 1:53 Stephen Rothwell
0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2020-12-09 1:53 UTC (permalink / raw)
To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI
Cc: Linux Next Mailing List, Lucas De Marchi,
Linux Kernel Mailing List, Chris Wilson
[-- Attachment #1.1: Type: text/plain, Size: 1903 bytes --]
Hi all,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/i915/gt/intel_mocs.c: In function 'get_mocs_settings':
drivers/gpu/drm/i915/gt/intel_mocs.c:363:22: error: 'GEN11_NUM_MOCS_ENTRIES' undeclared (first use in this function); did you mean 'GEN9_NUM_MOCS_ENTRIES'?
363 | table->n_entries = GEN11_NUM_MOCS_ENTRIES;
| ^~~~~~~~~~~~~~~~~~~~~~
| GEN9_NUM_MOCS_ENTRIES
drivers/gpu/drm/i915/gt/intel_mocs.c:363:22: note: each undeclared identifier is reported only once for each function it appears in
Caused by commit
2606b269234b ("drm/i915/dg1: Define MOCS table for DG1")
interacting with commit
7c5c15dffe1e ("drm/i915/gt: Declare gen9 has 64 mocs entries!")
from the drm-intel-fixes tree.
I have applied the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 9 Dec 2020 12:47:45 +1100
Subject: [PATCH] fixup for "drm/i915/gt: Declare gen9 has 64 mocs entries!"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index c60ca62b38df..ab6870242e18 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -360,7 +360,7 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
if (IS_DG1(i915)) {
table->size = ARRAY_SIZE(dg1_mocs_table);
table->table = dg1_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (INTEL_GEN(i915) >= 12) {
table->size = ARRAY_SIZE(tgl_mocs_table);
table->table = tgl_mocs_table;
--
2.29.2
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Intel-gfx] linux-next: build failure after merge of the drm tree
@ 2020-05-08 4:29 Stephen Rothwell
0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2020-05-08 4:29 UTC (permalink / raw)
To: Dave Airlie, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Chris Wilson
[-- Attachment #1.1: Type: text/plain, Size: 4395 bytes --]
Hi all,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from include/asm-generic/bug.h:19,
from arch/x86/include/asm/bug.h:83,
from include/linux/bug.h:5,
from include/linux/seq_file.h:7,
from include/drm/drm_print.h:31,
from drivers/gpu/drm/i915/gt/intel_engine_cs.c:25:
drivers/gpu/drm/i915/gt/intel_engine_cs.c: In function 'intel_engine_print_registers':
drivers/gpu/drm/i915/gt/intel_engine_cs.c:1428:31: error: 'struct intel_context' has no member named 'lrc_desc'
1428 | upper_32_bits(rq->context->lrc_desc));
| ^~
drivers/gpu/drm/i915/gt/intel_engine_cs.c:1440:31: error: 'struct intel_context' has no member named 'lrc_desc'
1440 | upper_32_bits(rq->context->lrc_desc));
| ^~
In file included from include/linux/interrupt.h:6,
from drivers/gpu/drm/i915/gt/intel_lrc.c:134:
drivers/gpu/drm/i915/gt/intel_lrc.c: In function 'active_context':
drivers/gpu/drm/i915/gt/intel_lrc.c:2850:32: error: 'struct intel_context' has no member named 'lrc_desc'
2850 | if (upper_32_bits(rq->context->lrc_desc) == ccid) {
| ^~
drivers/gpu/drm/i915/gt/intel_lrc.c:2859:32: error: 'struct intel_context' has no member named 'lrc_desc'
2859 | if (upper_32_bits(rq->context->lrc_desc) == ccid) {
| ^~
Caused by commit
53b2622e7746 ("drm/i915/execlists: Avoid reusing the same logical CCID")
from the drm-intel-fixes tree interacting with commits
606727842d8b ("drm/i915/gt: Include the execlists CCID of each port in the engine dump")
4c977837ba29 ("drm/i915/execlists: Peek at the next submission for error interrupts")
from the drm tree.
I have added teh following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 May 2020 14:21:40 +1000
Subject: [PATCH] drm/i915/execlists: fix up for "Avoid reusing the same logical CCID"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 ++--
drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index b1f8527f02c8..7c3cb5aedfdf 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -1425,7 +1425,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
len = scnprintf(hdr, sizeof(hdr),
"\t\tActive[%d]: ccid:%08x, ",
(int)(port - execlists->active),
- upper_32_bits(rq->context->lrc_desc));
+ rq->context->lrc.ccid);
len += print_ring(hdr + len, sizeof(hdr) - len, rq);
scnprintf(hdr + len, sizeof(hdr) - len, "rq: ");
print_request(m, rq, hdr);
@@ -1437,7 +1437,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,
len = scnprintf(hdr, sizeof(hdr),
"\t\tPending[%d]: ccid:%08x, ",
(int)(port - execlists->pending),
- upper_32_bits(rq->context->lrc_desc));
+ rq->context->lrc.ccid);
len += print_ring(hdr + len, sizeof(hdr) - len, rq);
scnprintf(hdr + len, sizeof(hdr) - len, "rq: ");
print_request(m, rq, hdr);
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 233f815c3c86..456d286c17dd 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -2847,7 +2847,7 @@ active_context(struct intel_engine_cs *engine, u32 ccid)
*/
for (port = el->active; (rq = *port); port++) {
- if (upper_32_bits(rq->context->lrc_desc) == ccid) {
+ if (rq->context->lrc.ccid == ccid) {
ENGINE_TRACE(engine,
"ccid found at active:%zd\n",
port - el->active);
@@ -2856,7 +2856,7 @@ active_context(struct intel_engine_cs *engine, u32 ccid)
}
for (port = el->pending; (rq = *port); port++) {
- if (upper_32_bits(rq->context->lrc_desc) == ccid) {
+ if (rq->context->lrc.ccid == ccid) {
ENGINE_TRACE(engine,
"ccid found at pending:%zd\n",
port - el->pending);
--
2.26.2
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-01-20 1:35 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-19 2:12 [Intel-gfx] linux-next: build failure after merge of the drm tree Stephen Rothwell
2023-01-19 2:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2023-01-19 3:04 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-19 22:15 ` [Intel-gfx] " Rodrigo Vivi
2023-01-20 1:35 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
[not found] <20210820123348.6535a87e@canb.auug.org.au>
[not found] ` <CAK7LNASv-F1Y7kpaDF+_=TW0Jzvpo1uuNL1B5jUmCCRqv-45bA@mail.gmail.com>
[not found] ` <20210902075038.7461d3c8@canb.auug.org.au>
[not found] ` <20210906084947.4f65761d@canb.auug.org.au>
2021-09-06 7:34 ` [Intel-gfx] " Daniel Vetter
2021-09-08 3:13 ` Masahiro Yamada
2021-09-08 9:07 ` Daniel Vetter
[not found] <20210108115518.2b3fdf58@canb.auug.org.au>
2021-01-08 1:25 ` Stephen Rothwell
2021-01-10 23:56 ` Stephen Rothwell
2021-01-18 0:59 ` Stephen Rothwell
2021-01-18 1:06 ` Dave Airlie
2021-01-20 12:12 ` Daniel Vetter
2021-01-20 20:44 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-12-09 1:53 Stephen Rothwell
2020-05-08 4:29 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).