* linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
@ 2020-01-08 6:08 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-01-08 6:08 UTC (permalink / raw)
To: Christoph Hellwig, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Matthew Auld,
Chris Wilson
[-- Attachment #1: Type: text/plain, Size: 1721 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_gtt.c
between commit:
2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
from the drm-intel tree and commit:
4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
from the generic-ioremap tree.
I fixed it up (I used the file from the former and added the following
merge fix patch) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 8 Jan 2020 17:04:59 +1100
Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 99189cdba8a9..1a2b5dcde960 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
* readback check when writing GTT PTE entries.
*/
if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
- ggtt->gsm = ioremap_nocache(phys_addr, size);
+ ggtt->gsm = ioremap(phys_addr, size);
else
ggtt->gsm = ioremap_wc(phys_addr, size);
if (!ggtt->gsm) {
--
2.24.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
@ 2020-01-08 6:08 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-01-08 6:08 UTC (permalink / raw)
To: Christoph Hellwig, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Matthew Auld
[-- Attachment #1.1: Type: text/plain, Size: 1721 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_gtt.c
between commit:
2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
from the drm-intel tree and commit:
4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
from the generic-ioremap tree.
I fixed it up (I used the file from the former and added the following
merge fix patch) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 8 Jan 2020 17:04:59 +1100
Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 99189cdba8a9..1a2b5dcde960 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
* readback check when writing GTT PTE entries.
*/
if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
- ggtt->gsm = ioremap_nocache(phys_addr, size);
+ ggtt->gsm = ioremap(phys_addr, size);
else
ggtt->gsm = ioremap_wc(phys_addr, size);
if (!ggtt->gsm) {
--
2.24.0
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Intel-gfx] linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
@ 2020-01-08 6:08 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-01-08 6:08 UTC (permalink / raw)
To: Christoph Hellwig, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Matthew Auld
[-- Attachment #1.1: Type: text/plain, Size: 1721 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_gtt.c
between commit:
2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
from the drm-intel tree and commit:
4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
from the generic-ioremap tree.
I fixed it up (I used the file from the former and added the following
merge fix patch) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 8 Jan 2020 17:04:59 +1100
Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 99189cdba8a9..1a2b5dcde960 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
* readback check when writing GTT PTE entries.
*/
if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
- ggtt->gsm = ioremap_nocache(phys_addr, size);
+ ggtt->gsm = ioremap(phys_addr, size);
else
ggtt->gsm = ioremap_wc(phys_addr, size);
if (!ggtt->gsm) {
--
2.24.0
--
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] 9+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
2020-01-08 6:08 ` Stephen Rothwell
(?)
(?)
@ 2020-01-08 6:13 ` Patchwork
-1 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2020-01-08 6:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
URL : https://patchwork.freedesktop.org/series/71736/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
5e406a43874d linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
-:15: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")'
#15:
2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
total: 1 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] 9+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
2020-01-08 6:08 ` Stephen Rothwell
` (2 preceding siblings ...)
(?)
@ 2020-01-08 6:38 ` Patchwork
-1 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2020-01-08 6:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
URL : https://patchwork.freedesktop.org/series/71736/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7699 -> Patchwork_16021
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/index.html
Known issues
------------
Here are the changes found in Patchwork_16021 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq: [PASS][1] -> [DMESG-WARN][2] ([i915#88])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-skl-6770hq/igt@i915_module_load@reload-with-fault-injection.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-skl-6770hq/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [PASS][3] -> [DMESG-FAIL][4] ([i915#553])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-hsw-4770r/igt@i915_selftest@live_blt.html
- fi-hsw-4770: [PASS][5] -> [DMESG-FAIL][6] ([i915#563])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-hsw-4770/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-hsw-4770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_execlists:
- fi-kbl-soraka: [PASS][7] -> [DMESG-FAIL][8] ([i915#656])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
- fi-skl-6770hq: [PASS][9] -> [DMESG-FAIL][10] ([i915#841])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-skl-6770hq/igt@i915_selftest@live_execlists.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-skl-6770hq/igt@i915_selftest@live_execlists.html
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [FAIL][11] ([i915#178]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live_blt:
- fi-ivb-3770: [DMESG-FAIL][13] ([i915#725]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-ivb-3770/igt@i915_selftest@live_blt.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-ivb-3770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gt_heartbeat:
- fi-bxt-dsi: [DMESG-FAIL][15] ([fdo#112406]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-bxt-dsi/igt@i915_selftest@live_gt_heartbeat.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-bxt-dsi/igt@i915_selftest@live_gt_heartbeat.html
[fdo#112406]: https://bugs.freedesktop.org/show_bug.cgi?id=112406
[i915#178]: https://gitlab.freedesktop.org/drm/intel/issues/178
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#841]: https://gitlab.freedesktop.org/drm/intel/issues/841
[i915#88]: https://gitlab.freedesktop.org/drm/intel/issues/88
Participating hosts (49 -> 40)
------------------------------
Additional (1): fi-skl-lmem
Missing (10): fi-ilk-m540 fi-hsw-4200u fi-glk-dsi fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-gdg-551 fi-tgl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7699 -> Patchwork_16021
CI-20190529: 20190529
CI_DRM_7699: 9aa67e1d77888cf258597d5009a6ab1762418ef6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5358: c6fc013f414b806175dc4143c58ab445e5235ea5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16021: 5e406a43874d35e4986470c60079363e79817ef5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5e406a43874d linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
2020-01-08 6:08 ` Stephen Rothwell
` (3 preceding siblings ...)
(?)
@ 2020-01-08 23:25 ` Patchwork
-1 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2020-01-08 23:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
URL : https://patchwork.freedesktop.org/series/71736/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7699_full -> Patchwork_16021_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_16021_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vcs1-dirty-create:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276] / [fdo#112080]) +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb1/igt@gem_ctx_isolation@vcs1-dirty-create.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb8/igt@gem_ctx_isolation@vcs1-dirty-create.html
* igt@gem_ctx_isolation@vecs0-s3:
- shard-kbl: [PASS][3] -> [INCOMPLETE][4] ([fdo#103665])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-kbl7/igt@gem_ctx_isolation@vecs0-s3.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl1/igt@gem_ctx_isolation@vecs0-s3.html
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#110841])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb8/igt@gem_ctx_shared@exec-single-timeline-bsd.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd.html
* igt@gem_eio@reset-stress:
- shard-tglb: [PASS][7] -> [INCOMPLETE][8] ([i915#470])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb8/igt@gem_eio@reset-stress.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb9/igt@gem_eio@reset-stress.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#110854])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb1/igt@gem_exec_balancer@smoke.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb8/igt@gem_exec_balancer@smoke.html
- shard-tglb: [PASS][11] -> [INCOMPLETE][12] ([fdo#111593] / [i915#472])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb2/igt@gem_exec_balancer@smoke.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb8/igt@gem_exec_balancer@smoke.html
* igt@gem_exec_parallel@contexts:
- shard-tglb: [PASS][13] -> [INCOMPLETE][14] ([i915#470] / [i915#472])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb2/igt@gem_exec_parallel@contexts.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb3/igt@gem_exec_parallel@contexts.html
* igt@gem_exec_schedule@pi-shared-iova-bsd:
- shard-iclb: [PASS][15] -> [SKIP][16] ([i915#677]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb7/igt@gem_exec_schedule@pi-shared-iova-bsd.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb2/igt@gem_exec_schedule@pi-shared-iova-bsd.html
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#112146]) +5 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb7/igt@gem_exec_schedule@preempt-other-chain-bsd.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb2/igt@gem_exec_schedule@preempt-other-chain-bsd.html
* igt@gem_exec_schedule@smoketest-vebox:
- shard-tglb: [PASS][19] -> [INCOMPLETE][20] ([i915#472] / [i915#707])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb8/igt@gem_exec_schedule@smoketest-vebox.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb3/igt@gem_exec_schedule@smoketest-vebox.html
* igt@gem_persistent_relocs@forked-interruptible-thrashing:
- shard-tglb: [PASS][21] -> [FAIL][22] ([i915#520])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb7/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb2/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
* igt@gem_persistent_relocs@forked-thrashing:
- shard-snb: [PASS][23] -> [FAIL][24] ([i915#520])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-snb4/igt@gem_persistent_relocs@forked-thrashing.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-snb6/igt@gem_persistent_relocs@forked-thrashing.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][25] -> [FAIL][26] ([i915#454])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb8/igt@i915_pm_dc@dc6-psr.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb6/igt@i915_pm_dc@dc6-psr.html
* igt@i915_pm_rps@reset:
- shard-iclb: [PASS][27] -> [FAIL][28] ([i915#413])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb8/igt@i915_pm_rps@reset.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb1/igt@i915_pm_rps@reset.html
* igt@i915_suspend@sysfs-reader:
- shard-kbl: [PASS][29] -> ([DMESG-WARN][30], [PASS][31]) ([i915#180])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-kbl4/igt@i915_suspend@sysfs-reader.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl4/igt@i915_suspend@sysfs-reader.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl3/igt@i915_suspend@sysfs-reader.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][32] -> [FAIL][33] ([i915#79])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl9/igt@kms_flip@flip-vs-expired-vblank.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl9/igt@kms_flip@flip-vs-expired-vblank.html
- shard-kbl: [PASS][34] -> [FAIL][35] ([i915#79])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-kbl3/igt@kms_flip@flip-vs-expired-vblank.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl1/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [PASS][36] -> [DMESG-WARN][37] ([i915#180]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-apl3/igt@kms_flip@flip-vs-suspend-interruptible.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-apl6/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [PASS][38] -> [FAIL][39] ([i915#34])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl9/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl5/igt@kms_flip@plain-flip-fb-recreate-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][40] -> [DMESG-WARN][41] ([i915#180]) +5 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-suspend.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl4/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-pwrite:
- shard-tglb: [PASS][42] -> [FAIL][43] ([i915#49]) +2 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-pwrite.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-pwrite.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][44] -> [SKIP][45] ([fdo#109441]) +2 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb4/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-skl: [PASS][46] -> [INCOMPLETE][47] ([i915#69])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl10/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl9/igt@kms_vblank@pipe-a-ts-continuation-suspend.html
* igt@perf_pmu@busy-vcs1:
- shard-iclb: [PASS][48] -> [SKIP][49] ([fdo#112080]) +8 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb4/igt@perf_pmu@busy-vcs1.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb5/igt@perf_pmu@busy-vcs1.html
* igt@perf_pmu@cpu-hotplug:
- shard-hsw: [PASS][50] -> [INCOMPLETE][51] ([i915#61])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-hsw5/igt@perf_pmu@cpu-hotplug.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-hsw4/igt@perf_pmu@cpu-hotplug.html
* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [PASS][52] -> [SKIP][53] ([fdo#109276]) +23 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb1/igt@prime_vgem@fence-wait-bsd2.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb8/igt@prime_vgem@fence-wait-bsd2.html
#### Possible fixes ####
* igt@gem_busy@extended-parallel-vcs1:
- shard-iclb: [SKIP][54] ([fdo#112080]) -> [PASS][55] +16 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb8/igt@gem_busy@extended-parallel-vcs1.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb1/igt@gem_busy@extended-parallel-vcs1.html
* igt@gem_ctx_isolation@vcs1-clean:
- shard-iclb: [SKIP][56] ([fdo#109276] / [fdo#112080]) -> [PASS][57] +6 similar issues
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb8/igt@gem_ctx_isolation@vcs1-clean.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb1/igt@gem_ctx_isolation@vcs1-clean.html
* igt@gem_ctx_shared@q-smoketest-vebox:
- shard-tglb: [INCOMPLETE][58] ([fdo#111735]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb3/igt@gem_ctx_shared@q-smoketest-vebox.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb1/igt@gem_ctx_shared@q-smoketest-vebox.html
* igt@gem_exec_await@wide-all:
- shard-tglb: [INCOMPLETE][60] ([fdo#111736] / [i915#472]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb4/igt@gem_exec_await@wide-all.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb3/igt@gem_exec_await@wide-all.html
* igt@gem_exec_nop@basic-series:
- shard-tglb: [INCOMPLETE][62] ([i915#435] / [i915#472]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb9/igt@gem_exec_nop@basic-series.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb8/igt@gem_exec_nop@basic-series.html
* igt@gem_exec_parallel@basic:
- shard-tglb: [INCOMPLETE][64] ([i915#472] / [i915#476]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb9/igt@gem_exec_parallel@basic.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb7/igt@gem_exec_parallel@basic.html
* igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [SKIP][66] ([i915#677]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb1/igt@gem_exec_schedule@pi-common-bsd.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb8/igt@gem_exec_schedule@pi-common-bsd.html
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [SKIP][68] ([fdo#109276]) -> [PASS][69] +18 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb5/igt@gem_exec_schedule@preempt-queue-bsd1.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb2/igt@gem_exec_schedule@preempt-queue-bsd1.html
* igt@gem_exec_schedule@preempt-queue-contexts-bsd2:
- shard-tglb: [INCOMPLETE][70] ([fdo#111606] / [fdo#111677] / [i915#472]) -> [PASS][71]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb9/igt@gem_exec_schedule@preempt-queue-contexts-bsd2.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb7/igt@gem_exec_schedule@preempt-queue-contexts-bsd2.html
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][72] ([fdo#112146]) -> [PASS][73] +7 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb1/igt@gem_exec_schedule@preemptive-hang-bsd.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb5/igt@gem_exec_schedule@preemptive-hang-bsd.html
* igt@gem_exec_suspend@basic-s4-devices:
- shard-tglb: [INCOMPLETE][74] ([i915#460] / [i915#472]) -> [PASS][75]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb6/igt@gem_exec_suspend@basic-s4-devices.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb9/igt@gem_exec_suspend@basic-s4-devices.html
* igt@gem_persistent_relocs@forked-interruptible-thrashing:
- shard-snb: [FAIL][76] ([i915#520]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-snb5/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-snb5/igt@gem_persistent_relocs@forked-interruptible-thrashing.html
* igt@gem_softpin@noreloc-s3:
- shard-apl: [DMESG-WARN][78] ([i915#180]) -> [PASS][79] +2 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-apl1/igt@gem_softpin@noreloc-s3.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-apl6/igt@gem_softpin@noreloc-s3.html
* igt@i915_selftest@live_blt:
- shard-hsw: [DMESG-FAIL][80] ([i915#553] / [i915#725]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-hsw1/igt@i915_selftest@live_blt.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-hsw2/igt@i915_selftest@live_blt.html
* igt@kms_color@pipe-b-ctm-negative:
- shard-skl: [DMESG-WARN][82] ([i915#109]) -> [PASS][83] +3 similar issues
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl4/igt@kms_color@pipe-b-ctm-negative.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl1/igt@kms_color@pipe-b-ctm-negative.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-kbl: [DMESG-WARN][84] ([i915#180]) -> [PASS][85] +3 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-kbl3/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl1/igt@kms_cursor_crc@pipe-c-cursor-suspend.html
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][86] ([i915#221]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl6/igt@kms_flip@flip-vs-suspend.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl9/igt@kms_flip@flip-vs-suspend.html
* igt@kms_flip@plain-flip-ts-check-interruptible:
- shard-skl: [FAIL][88] ([i915#34]) -> [PASS][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl9/igt@kms_flip@plain-flip-ts-check-interruptible.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl9/igt@kms_flip@plain-flip-ts-check-interruptible.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][90] ([fdo#108145]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl5/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][92] ([fdo#109642] / [fdo#111068]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb5/igt@kms_psr2_su@page_flip.html
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb2/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][94] ([fdo#109441]) -> [PASS][95] +3 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb7/igt@kms_psr@psr2_primary_mmap_cpu.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][96] ([i915#69]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-skl7/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-skl5/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv-switch:
- shard-iclb: [SKIP][98] ([fdo#109276] / [fdo#112080]) -> [FAIL][99] ([IGT#28])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-iclb7/igt@gem_ctx_isolation@vcs1-nonpriv-switch.html
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-iclb2/igt@gem_ctx_isolation@vcs1-nonpriv-switch.html
* igt@gem_ctx_isolation@vcs2-reset:
- shard-tglb: [SKIP][100] ([fdo#112080]) -> [SKIP][101] ([fdo#111912] / [fdo#112080])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb9/igt@gem_ctx_isolation@vcs2-reset.html
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb7/igt@gem_ctx_isolation@vcs2-reset.html
* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: [FAIL][102] ([i915#454]) -> [SKIP][103] ([i915#468])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb7/igt@i915_pm_dc@dc6-dpms.html
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb2/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rpm@drm-resources-equal:
- shard-snb: [INCOMPLETE][104] ([i915#82]) -> [SKIP][105] ([fdo#109271])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-snb2/igt@i915_pm_rpm@drm-resources-equal.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-snb2/igt@i915_pm_rpm@drm-resources-equal.html
* igt@kms_atomic_transition@6x-modeset-transitions-nonblocking:
- shard-tglb: [SKIP][106] ([fdo#112021]) -> [SKIP][107] ([fdo#112016] / [fdo#112021])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-tglb9/igt@kms_atomic_transition@6x-modeset-transitions-nonblocking.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-tglb7/igt@kms_atomic_transition@6x-modeset-transitions-nonblocking.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][108] ([i915#31]) -> ([PASS][109], [FAIL][110]) ([i915#31])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/shard-kbl4/igt@kms_setmode@basic.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl4/igt@kms_setmode@basic.html
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/shard-kbl3/igt@kms_setmode@basic.html
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111593]: https://bugs.freedesktop.org/show_bug.cgi?id=111593
[fdo#111606]: https://bugs.freedesktop.org/show_bug.cgi?id=111606
[fdo#111677]: https://bugs.freedesktop.org/show_bug.cgi?id=111677
[fdo#111735]: https://bugs.freedesktop.org/show_bug.cgi?id=111735
[fdo#111736]: https://bugs.freedesktop.org/show_bug.cgi?id=111736
[fdo#111912]: https://bugs.freedesktop.org/show_bug.cgi?id=111912
[fdo#112016]: https://bugs.freedesktop.org/show_bug.cgi?id=112016
[fdo#112021]: https://bugs.freedesktop.org/show_bug.cgi?id=112021
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#221]: https://gitlab.freedesktop.org/drm/intel/issues/221
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#435]: https://gitlab.freedesktop.org/drm/intel/issues/435
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#460]: https://gitlab.freedesktop.org/drm/intel/issues/460
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#470]: https://gitlab.freedesktop.org/drm/intel/issues/470
[i915#472]: https://gitlab.freedesktop.org/drm/intel/issues/472
[i915#476]: https://gitlab.freedesktop.org/drm/intel/issues/476
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#520]: https://gitlab.freedesktop.org/drm/intel/issues/520
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#707]: https://gitlab.freedesktop.org/drm/intel/issues/707
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7699 -> Patchwork_16021
CI-20190529: 20190529
CI_DRM_7699: 9aa67e1d77888cf258597d5009a6ab1762418ef6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5358: c6fc013f414b806175dc4143c58ab445e5235ea5 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16021: 5e406a43874d35e4986470c60079363e79817ef5 @ 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_16021/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
2020-01-08 6:08 ` Stephen Rothwell
(?)
@ 2020-01-27 23:09 ` Stephen Rothwell
-1 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-01-27 23:09 UTC (permalink / raw)
To: Dave Airlie
Cc: Christoph Hellwig, Daniel Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI, Linux Next Mailing List,
Linux Kernel Mailing List, Matthew Auld, Chris Wilson
[-- Attachment #1: Type: text/plain, Size: 1960 bytes --]
Hi all,
On Wed, 8 Jan 2020 17:08:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_gem_gtt.c
>
> between commit:
>
> 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
>
> from the drm-intel tree and commit:
>
> 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
>
> from the generic-ioremap tree.
>
> I fixed it up (I used the file from the former and added the following
> merge fix patch) and can carry the fix as necessary. This is now fixed
> as far as linux-next is concerned, but any non trivial conflicts should
> be mentioned to your upstream maintainer when your tree is submitted for
> merging. You may also want to consider cooperating with the maintainer
> of the conflicting tree to minimise any particularly complex conflicts.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 8 Jan 2020 17:04:59 +1100
> Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> index 99189cdba8a9..1a2b5dcde960 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> @@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
> * readback check when writing GTT PTE entries.
> */
> if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
> - ggtt->gsm = ioremap_nocache(phys_addr, size);
> + ggtt->gsm = ioremap(phys_addr, size);
> else
> ggtt->gsm = ioremap_wc(phys_addr, size);
> if (!ggtt->gsm) {
> --
> 2.24.0
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
@ 2020-01-27 23:09 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-01-27 23:09 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List,
Linux Next Mailing List, DRI, Rodrigo Vivi, Christoph Hellwig,
Matthew Auld
[-- Attachment #1.1: Type: text/plain, Size: 1960 bytes --]
Hi all,
On Wed, 8 Jan 2020 17:08:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_gem_gtt.c
>
> between commit:
>
> 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
>
> from the drm-intel tree and commit:
>
> 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
>
> from the generic-ioremap tree.
>
> I fixed it up (I used the file from the former and added the following
> merge fix patch) and can carry the fix as necessary. This is now fixed
> as far as linux-next is concerned, but any non trivial conflicts should
> be mentioned to your upstream maintainer when your tree is submitted for
> merging. You may also want to consider cooperating with the maintainer
> of the conflicting tree to minimise any particularly complex conflicts.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 8 Jan 2020 17:04:59 +1100
> Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> index 99189cdba8a9..1a2b5dcde960 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> @@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
> * readback check when writing GTT PTE entries.
> */
> if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
> - ggtt->gsm = ioremap_nocache(phys_addr, size);
> + ggtt->gsm = ioremap(phys_addr, size);
> else
> ggtt->gsm = ioremap_wc(phys_addr, size);
> if (!ggtt->gsm) {
> --
> 2.24.0
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Intel-gfx] linux-next: manual merge of the generic-ioremap tree with the drm-intel tree
@ 2020-01-27 23:09 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2020-01-27 23:09 UTC (permalink / raw)
To: Dave Airlie
Cc: Daniel Vetter, Intel Graphics, Linux Kernel Mailing List,
Linux Next Mailing List, DRI, Christoph Hellwig, Matthew Auld
[-- Attachment #1.1: Type: text/plain, Size: 1960 bytes --]
Hi all,
On Wed, 8 Jan 2020 17:08:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the generic-ioremap tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_gem_gtt.c
>
> between commit:
>
> 2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
>
> from the drm-intel tree and commit:
>
> 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
>
> from the generic-ioremap tree.
>
> I fixed it up (I used the file from the former and added the following
> merge fix patch) and can carry the fix as necessary. This is now fixed
> as far as linux-next is concerned, but any non trivial conflicts should
> be mentioned to your upstream maintainer when your tree is submitted for
> merging. You may also want to consider cooperating with the maintainer
> of the conflicting tree to minimise any particularly complex conflicts.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 8 Jan 2020 17:04:59 +1100
> Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> index 99189cdba8a9..1a2b5dcde960 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
> @@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)
> * readback check when writing GTT PTE entries.
> */
> if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
> - ggtt->gsm = ioremap_nocache(phys_addr, size);
> + ggtt->gsm = ioremap(phys_addr, size);
> else
> ggtt->gsm = ioremap_wc(phys_addr, size);
> if (!ggtt->gsm) {
> --
> 2.24.0
This is now a conflict between the drm tree and Linus' tree.
--
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] 9+ messages in thread
end of thread, other threads:[~2020-01-27 23:09 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-08 6:08 linux-next: manual merge of the generic-ioremap tree with the drm-intel tree Stephen Rothwell
2020-01-08 6:08 ` [Intel-gfx] " Stephen Rothwell
2020-01-08 6:08 ` Stephen Rothwell
2020-01-08 6:13 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-01-08 6:38 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-01-08 23:25 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-01-27 23:09 ` Stephen Rothwell
2020-01-27 23:09 ` [Intel-gfx] " Stephen Rothwell
2020-01-27 23:09 ` Stephen Rothwell
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.