Skip to contentSkip to conversation

linux-next: manual merge of the drm-intel tree with the drm tree

PATCH Stephen Rothwell 3 participants 8 messages Mar 17, 2021 – May 14, 2021

Subsystems (4)
DRM drivers Linux-next tree Intel i915 Intel DRM display for xe and i915 drivers
lore
Share & tools
lore

Stephen Rothwell

author
#0 lore raw

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/display/intel_sprite.c

between commit:

92f1d09ca4ed ("drm: Switch to %p4cc format modifier")

from the drm tree and commit:

46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")

from the drm-intel tree.

I fixed it up (I used the latter version of the file and applied the following 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 <[email protected]>
Date: Wed, 17 Mar 2021 14:05:42 +1100
Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier"

Signed-off-by Stephen Rothwell <[email protected]>
---
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/skl_universal_plane.c +2 -4
index 1f335cb09149..45ceff436bf7 100644
@@ -1120,7 +1120,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
 	const struct drm_framebuffer *fb = plane_state->hw.fb;
 	unsigned int rotation = plane_state->hw.rotation;
-	struct drm_format_name_buf format_name;
 
 	if (!fb)
 		return 0;

@@ -1168,9 +1167,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 		case DRM_FORMAT_XVYU12_16161616:
 		case DRM_FORMAT_XVYU16161616:
 			drm_dbg_kms(&dev_priv->drm,
-				    "Unsupported pixel format %s for 90/270!\n",
-				    drm_get_format_name(fb->format->format,
-							&format_name));
+				    "Unsupported pixel format %p4cc for 90/270!\n",
+				    &fb->format->format);
 			return -EINVAL;
 		default:
 			break;
Signature · 5 lines
2.30.0

-- 
Cheers,
Stephen Rothwell

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

CI
#1 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: manual merge of the drm-intel tree with the drm tree

== Series Details ==

== Series Details ==

Series: linux-next: manual merge of the drm-intel tree with the drm tree
URL : https://patchwork.freedesktop.org/series/88033/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
6193c9b6da03 linux-next: manual merge of the drm-intel tree with the drm tree
-:15: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 92f1d09ca4ed ("drm: Switch to %p4cc format modifier")'
#15: 
  92f1d09ca4ed ("drm: Switch to %p4cc format modifier")

-:19: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")' #19:
46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")

total: 2 errors, 0 warnings, 0 checks, 18 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

CI
#2 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: manual merge of the drm-intel tree with the drm tree

In reply to Stephen Rothwell
== Series Details ==

== Series Details ==

Series: linux-next: manual merge of the drm-intel tree with the drm tree
URL : https://patchwork.freedesktop.org/series/88033/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9862 -> Patchwork_19799
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/index.html

Known issues
------------

Here are the changes found in Patchwork_19799 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][1] ([fdo#109271]) +26 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-bdw-5557u/igt@amdgpu/[email protected]

* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: NOTRUN -> [WARN][2] ([i915#2283])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-bdw-5557u/igt@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-byt-j1900: NOTRUN -> [SKIP][3] ([fdo#109271]) +27 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-byt-j1900/igt@[email protected]

* igt@gem_tiled_blits@basic:
- fi-kbl-8809g: [PASS][4] -> [TIMEOUT][5] ([i915#2502] / [i915#3145])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/fi-kbl-8809g/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-kbl-8809g/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][6] -> [INCOMPLETE][7] ([i915#2782])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/fi-snb-2600/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-snb-2600/igt@i915_selftest@[email protected]

* igt@kms_chamelium@dp-crc-fast:
- fi-bdw-5557u: NOTRUN -> [SKIP][8] ([fdo#109271] / [fdo#111827]) +8 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-bdw-5557u/igt@[email protected]

* igt@kms_chamelium@hdmi-crc-fast:
- fi-byt-j1900: NOTRUN -> [SKIP][9] ([fdo#109271] / [fdo#111827]) +8 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-byt-j1900/igt@[email protected]

#### Possible fixes ####

* igt@gem_linear_blits@basic:
- fi-kbl-8809g: [TIMEOUT][10] ([i915#2502] / [i915#3145]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/fi-kbl-8809g/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-kbl-8809g/igt@[email protected]

* igt@gem_tiled_fence_blits@basic:
- fi-kbl-8809g: [TIMEOUT][12] ([i915#3145]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/fi-kbl-8809g/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-kbl-8809g/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- {fi-tgl-dsi}: [DMESG-WARN][14] ([i915#1982] / [i915#402]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/fi-tgl-dsi/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/fi-tgl-dsi/igt@[email protected]

{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
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2283]: https://gitlab.freedesktop.org/drm/intel/issues/2283
[i915#2502]: https://gitlab.freedesktop.org/drm/intel/issues/2502
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#3145]: https://gitlab.freedesktop.org/drm/intel/issues/3145
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402

Participating hosts (45 -> 41)
------------------------------

Additional (1): fi-byt-j1900
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus

Build changes
-------------

* Linux: CI_DRM_9862 -> Patchwork_19799

CI-20190529: 20190529
CI_DRM_9862: 06f8e98db6ddfcf1e1d36e5f107c3ad8412d756e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6033: ecfe4c613cdbc082e4a561ead120b40349b63f2b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19799: 6193c9b6da031bd667e5ab684a5f2d20f3cc9b06 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

6193c9b6da03 linux-next: manual merge of the drm-intel tree with the drm tree

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

CI
#3 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for linux-next: manual merge of the drm-intel tree with the drm tree

In reply to Stephen Rothwell
== Series Details ==

== Series Details ==

Series: linux-next: manual merge of the drm-intel tree with the drm tree
URL : https://patchwork.freedesktop.org/series/88033/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9862_full -> Patchwork_19799_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Known issues
------------

Here are the changes found in Patchwork_19799_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_persistence@process:
- shard-snb: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#1099]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-snb6/igt@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][2] -> [TIMEOUT][3] ([i915#2369] / [i915#3063])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb6/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb2/igt@[email protected]

* igt@gem_exec_balancer@hang:
- shard-iclb: [PASS][4] -> [INCOMPLETE][5] ([i915#1895])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb5/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb2/igt@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-kbl: [PASS][6] -> [FAIL][7] ([i915#2846])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl2/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl1/igt@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][8] -> [FAIL][9] ([i915#2842]) +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl6/igt@gem_exec_fair@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-tglb: [PASS][10] -> [FAIL][11] ([i915#2842])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb2/igt@gem_exec_fair@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-glk: [PASS][12] -> [FAIL][13] ([i915#2842])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk5/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk1/igt@gem_exec_fair@[email protected]
- shard-iclb: [PASS][14] -> [FAIL][15] ([i915#2849])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb8/igt@gem_exec_fair@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb5/igt@gem_exec_fair@[email protected]

* igt@gem_exec_gttfill@all:
- shard-glk: [PASS][16] -> [DMESG-WARN][17] ([i915#118] / [i915#95]) +1 similar issue
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk2/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk7/igt@[email protected]

* igt@gem_exec_reloc@basic-parallel:
- shard-skl: NOTRUN -> [TIMEOUT][18] ([i915#3183])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl7/igt@[email protected]

* igt@gem_exec_reloc@basic-wide-active@rcs0:
- shard-snb: NOTRUN -> [FAIL][19] ([i915#2389]) +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-snb5/igt@gem_exec_reloc@[email protected]

* igt@gem_exec_schedule@u-fairslice@vcs0:
- shard-skl: [PASS][20] -> [DMESG-WARN][21] ([i915#1610] / [i915#2803])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl8/igt@gem_exec_schedule@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl5/igt@gem_exec_schedule@[email protected]

* igt@gem_exec_schedule@u-fairslice@vcs1:
- shard-tglb: [PASS][22] -> [DMESG-WARN][23] ([i915#2803])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb6/igt@gem_exec_schedule@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb1/igt@gem_exec_schedule@[email protected]

* igt@gem_mmap_gtt@big-copy:
- shard-glk: [PASS][24] -> [FAIL][25] ([i915#307])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk5/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk1/igt@[email protected]

* igt@gem_mmap_gtt@big-copy-odd:
- shard-skl: NOTRUN -> [FAIL][26] ([i915#307])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl10/igt@[email protected]

* igt@gem_pread@exhaustion:
- shard-snb: NOTRUN -> [WARN][27] ([i915#2658])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-snb5/igt@[email protected]

* igt@gem_softpin@noreloc-s3:
- shard-apl: NOTRUN -> [DMESG-WARN][28] ([i915#180])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-apl6/igt@[email protected]

* igt@gem_vm_create@destroy-race:
- shard-tglb: [PASS][29] -> [TIMEOUT][30] ([i915#2795])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb7/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb5/igt@[email protected]

* igt@gen9_exec_parse@allowed-all:
- shard-kbl: [PASS][31] -> [DMESG-WARN][32] ([i915#1436] / [i915#716])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl1/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl4/igt@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-skl: NOTRUN -> [DMESG-WARN][33] ([i915#1436] / [i915#716])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl6/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- shard-snb: NOTRUN -> [INCOMPLETE][34] ([i915#2782])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-snb6/igt@i915_selftest@[email protected]

* igt@kms_chamelium@hdmi-crc-multiple:
- shard-snb: NOTRUN -> [SKIP][35] ([fdo#109271] / [fdo#111827]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-snb5/igt@[email protected]

* igt@kms_chamelium@vga-hpd:
- shard-apl: NOTRUN -> [SKIP][36] ([fdo#109271] / [fdo#111827]) +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-apl6/igt@[email protected]

* igt@kms_color@pipe-c-ctm-blue-to-red:
- shard-skl: [PASS][37] -> [DMESG-WARN][38] ([i915#1982]) +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl6/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl8/igt@[email protected]

* igt@kms_color_chamelium@pipe-b-ctm-max:
- shard-skl: NOTRUN -> [SKIP][39] ([fdo#109271] / [fdo#111827]) +10 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl10/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-256x85-random:
- shard-skl: [PASS][40] -> [FAIL][41] ([i915#54]) +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl3/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl9/igt@[email protected]

* igt@kms_cursor_legacy@pipe-d-forked-move:
- shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271]) +8 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-apl6/igt@[email protected]

* igt@kms_cursor_legacy@pipe-d-single-bo:
- shard-skl: NOTRUN -> [SKIP][43] ([fdo#109271] / [i915#533])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl5/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][44] -> [INCOMPLETE][45] ([i915#155] / [i915#180] / [i915#636])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl7/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl3/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [PASS][46] -> [FAIL][47] ([i915#2122])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl6/igt@kms_flip@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl8/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-apl: [PASS][48] -> [DMESG-WARN][49] ([i915#180]) +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-apl7/igt@kms_flip@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-apl6/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-skl: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#2672])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl5/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render:
- shard-snb: NOTRUN -> [SKIP][51] ([fdo#109271]) +85 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-snb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render.html

* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][52] -> [DMESG-WARN][53] ([i915#180]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl7/igt@[email protected]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl3/igt@[email protected]
- shard-skl: NOTRUN -> [FAIL][54] ([i915#1188])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl5/igt@[email protected]

* igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-a:
- shard-skl: [PASS][55] -> [FAIL][56] ([i915#2472])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl5/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl9/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-skl: NOTRUN -> [FAIL][57] ([fdo#108145] / [i915#265]) +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl5/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][58] -> [FAIL][59] ([fdo#108145] / [i915#265])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl8/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl1/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-d-coverage-7efc:
- shard-kbl: NOTRUN -> [SKIP][60] ([fdo#109271]) +4 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl2/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-skl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#658]) +3 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl7/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][62] -> [SKIP][63] ([fdo#109642] / [fdo#111068] / [i915#658])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb2/igt@kms_psr2_su@page_flip.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb5/igt@kms_psr2_su@page_flip.html

* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][64] -> [SKIP][65] ([fdo#109441]) +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb5/igt@kms_psr@psr2_primary_page_flip.html

* igt@kms_vblank@pipe-d-query-forked-busy:
- shard-skl: NOTRUN -> [SKIP][66] ([fdo#109271]) +117 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl7/igt@[email protected]

* igt@perf@polling-parameterized:
- shard-glk: [PASS][67] -> [FAIL][68] ([i915#1542])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk3/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk9/igt@[email protected]

* igt@sysfs_clients@recycle-many:
- shard-apl: [PASS][69] -> [FAIL][70] ([i915#3028])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-apl7/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-apl6/igt@[email protected]
- shard-kbl: [PASS][71] -> [FAIL][72] ([i915#3028])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl2/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl1/igt@[email protected]
- shard-snb: NOTRUN -> [FAIL][73] ([i915#3028])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-snb5/igt@[email protected]

* igt@sysfs_clients@sema-10@rcs0:
- shard-skl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#3026]) +2 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl6/igt@sysfs_clients@[email protected]

* igt@sysfs_clients@sema-10@vcs0:
- shard-apl: [PASS][75] -> [SKIP][76] ([fdo#109271] / [i915#3026]) +1 similar issue
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-apl6/igt@sysfs_clients@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-apl8/igt@sysfs_clients@[email protected]

#### Possible fixes ####

* igt@gem_eio@unwedge-stress:
- shard-iclb: [TIMEOUT][77] ([i915#2369] / [i915#2481] / [i915#3070]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb1/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb8/igt@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][79] ([i915#2846]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk2/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk7/igt@[email protected]

* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: [FAIL][81] ([i915#2842]) -> [PASS][82] +2 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk7/igt@gem_exec_fair@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk5/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [FAIL][83] ([i915#2842]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb3/igt@gem_exec_fair@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- shard-kbl: [SKIP][85] ([fdo#109271]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl4/igt@gem_exec_fair@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [FAIL][87] ([i915#2842]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb2/igt@gem_exec_fair@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_schedule@u-fairslice@vecs0:
- shard-skl: [DMESG-WARN][89] ([i915#1610] / [i915#2803]) -> [PASS][90] +1 similar issue
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl8/igt@gem_exec_schedule@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl5/igt@gem_exec_schedule@[email protected]

* igt@gem_exec_whisper@basic-queues-priority-all:
- shard-glk: [DMESG-WARN][91] ([i915#118] / [i915#95]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk4/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk7/igt@[email protected]

* igt@gem_mmap_gtt@cpuset-medium-copy:
- shard-iclb: [FAIL][93] ([i915#2428]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb2/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb4/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][95] ([i915#454]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb2/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb5/igt@[email protected]

* igt@kms_async_flips@test-time-stamp:
- shard-tglb: [FAIL][97] ([i915#2597]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb8/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb8/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][99] ([i915#180]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl4/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl2/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-256x85-offscreen:
- shard-skl: [FAIL][101] ([i915#54]) -> [PASS][102] +1 similar issue
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl4/igt@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl10/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [DMESG-WARN][103] ([i915#180]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-apl7/igt@kms_flip@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-apl6/igt@kms_flip@[email protected]

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][105] ([fdo#109441]) -> [PASS][106] +2 similar issues
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb6/igt@kms_psr@psr2_sprite_plane_move.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

* igt@sysfs_clients@recycle:
- shard-kbl: [FAIL][107] ([i915#3028]) -> [PASS][108]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl6/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl1/igt@[email protected]

* igt@sysfs_clients@sema-10@vcs0:
- shard-glk: [SKIP][109] ([fdo#109271] / [i915#3026]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-glk7/igt@sysfs_clients@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-glk5/igt@sysfs_clients@[email protected]

#### Warnings ####

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][111] ([i915#2684]) -> [WARN][112] ([i915#1804] / [i915#2684])
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb5/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb7/igt@[email protected]

* igt@kms_content_protection@atomic:
- shard-iclb: [FAIL][113] ([i915#3137]) -> [SKIP][114] ([fdo#109300] / [fdo#111066]) +1 similar issue
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb1/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb7/igt@[email protected]

* igt@kms_content_protection@dp-mst-type-1:
- shard-iclb: [SKIP][115] ([i915#3116]) -> [FAIL][116] ([i915#3137])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb4/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb1/igt@[email protected]

* igt@kms_content_protection@uevent:
- shard-iclb: [SKIP][117] ([fdo#109300] / [fdo#111066]) -> [FAIL][118] ([i915#3144])
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb8/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb1/igt@[email protected]

* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-iclb: [SKIP][119] ([i915#2920]) -> [SKIP][120] ([i915#658]) +3 similar issues
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb2/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb5/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1:
- shard-iclb: [SKIP][121] ([i915#658]) -> [SKIP][122] ([i915#2920])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-iclb5/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-iclb2/igt@[email protected]

* igt@runner@aborted:
- shard-kbl: ([FAIL][123], [FAIL][124], [FAIL][125], [FAIL][126]) ([i915#1814] / [i915#2724] / [i915#3002]) -> ([FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132], [FAIL][133]) ([fdo#109271] / [i915#1436] / [i915#180] / [i915#1814] / [i915#2505] / [i915#2724] / [i915#3002] / [i915#716] / [i915#92])
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl1/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl2/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl7/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-kbl4/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl3/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl7/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl4/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl6/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl4/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl3/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-kbl3/igt@[email protected]
- shard-tglb: ([FAIL][134], [FAIL][135], [FAIL][136]) ([i915#2667] / [i915#3002]) -> ([FAIL][137], [FAIL][138], [FAIL][139], [FAIL][140]) ([i915#2426] / [i915#2667] / [i915#2803] / [i915#3002])
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb8/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb6/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-tglb1/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb1/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb2/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb2/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-tglb5/igt@[email protected]
- shard-skl: ([FAIL][141], [FAIL][142], [FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146]) ([i915#2029] / [i915#2426] / [i915#2724] / [i915#3002]) -> ([FAIL][147], [FAIL][148], [FAIL][149], [FAIL][150], [FAIL][151], [FAIL][152], [FAIL][153], [FAIL][154]) ([i915#1436] / [i915#1814] / [i915#2029] / [i915#2426] / [i915#2724] / [i915#3002])
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl4/igt@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl7/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl8/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl3/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl4/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9862/shard-skl3/igt@[email protected]
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl2/igt@[email protected]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl1/igt@[email protected]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl5/igt@[email protected]
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl3/igt@[email protected]
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl6/igt@[email protected]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl3/igt@[email protected]
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl9/igt@[email protected]
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/shard-skl9/igt@[email protected]

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111066]: https://bugs.freedesktop.org/show_bug.cgi?id=111066
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1895]: https://gitlab.freedesktop.org/drm/intel/issues/1895
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2428]: https://gitlab.freedesktop.org/drm/intel/issues/2428
[i915#2472]: https://gitlab.freedesktop.org/drm/intel/issues/2472
[i915#2481]: https://gitlab.freedesktop.org/drm/intel/issues/2481
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2667]: https://gitlab.freedesktop.org/drm/intel/issues/2667
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2795]: https://gitlab.freedesktop.org/drm/intel/issues/2795
[i915#2803]: ht

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19799/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#4 lore raw
In reply to Stephen Rothwell

Hi all,

Quoted 57 lines · On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell <[email protected]>…

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/display/intel_sprite.c

between commit:

92f1d09ca4ed ("drm: Switch to %p4cc format modifier")

from the drm tree and commit:

46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")

from the drm-intel tree.

I fixed it up (I used the latter version of the file and applied the following 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 <[email protected]>
Date: Wed, 17 Mar 2021 14:05:42 +1100
Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier"

Signed-off-by Stephen Rothwell <[email protected]>
---
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/skl_universal_plane.c +2 -4
index 1f335cb09149..45ceff436bf7 100644
@@ -1120,7 +1120,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
 	const struct drm_framebuffer *fb = plane_state->hw.fb;
 	unsigned int rotation = plane_state->hw.rotation;
-	struct drm_format_name_buf format_name;
 
 	if (!fb)
 		return 0;

@@ -1168,9 +1167,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 		case DRM_FORMAT_XVYU12_16161616:
 		case DRM_FORMAT_XVYU16161616:
 			drm_dbg_kms(&dev_priv->drm,
-				    "Unsupported pixel format %s for 90/270!\n",
-				    drm_get_format_name(fb->format->format,
-							&format_name));
+				    "Unsupported pixel format %p4cc for 90/270!\n",
+				    &fb->format->format);
 			return -EINVAL;
 		default:
 			break;
Signature · 1 line
2.30.0

The above fix up patch now needs to be applied to the drm tree.

Signature · 2 lines
Cheers,
Stephen Rothwell

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#5 lore raw

Hi all,

Quoted 53 lines · On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell <[email protected]>…
Quoted 51 lines · On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell <[email protected]>…

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/display/intel_sprite.c

between commit:

92f1d09ca4ed ("drm: Switch to %p4cc format modifier")

from the drm tree and commit:

46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")

from the drm-intel tree.

I fixed it up (I used the latter version of the file and applied the following 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 <[email protected]>
Date: Wed, 17 Mar 2021 14:05:42 +1100
Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier"

Signed-off-by Stephen Rothwell <[email protected]>
---
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -4
index 1f335cb09149..45ceff436bf7 100644
@@ -1120,7 +1120,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
 	const struct drm_framebuffer *fb = plane_state->hw.fb;
 	unsigned int rotation = plane_state->hw.rotation;
-	struct drm_format_name_buf format_name;
 
 	if (!fb)
 		return 0;

@@ -1168,9 +1167,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 		case DRM_FORMAT_XVYU12_16161616:
 		case DRM_FORMAT_XVYU16161616:
 			drm_dbg_kms(&dev_priv->drm,
-				    "Unsupported pixel format %s for 90/270!\n",
-				    drm_get_format_name(fb->format->format,
-							&format_name));
+				    "Unsupported pixel format %p4cc for 90/270!\n",
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -0
+				    &fb->format->format);
 			return -EINVAL;
 		default:
 			break;
Signature · 1 line
2.30.0

The above fix up patch now needs to be applied to the drm tree.

I am still applying the above patch, but it applies to Linus' tree now.

Signature · 2 lines
Cheers,
Stephen Rothwell
author
#6 lore raw

Hi all,

Quoted 64 lines · On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell <[email protected]>…
Quoted 53 lines · On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell <[email protected]>…
Quoted 51 lines · On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell <[email protected]>…

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/display/intel_sprite.c

between commit:

92f1d09ca4ed ("drm: Switch to %p4cc format modifier")

from the drm tree and commit:

46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")

from the drm-intel tree.

I fixed it up (I used the latter version of the file and applied the following 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 <[email protected]>
Date: Wed, 17 Mar 2021 14:05:42 +1100
Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier"

Signed-off-by Stephen Rothwell <[email protected]>
---
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -4
index 1f335cb09149..45ceff436bf7 100644
@@ -1120,7 +1120,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
 	const struct drm_framebuffer *fb = plane_state->hw.fb;
 	unsigned int rotation = plane_state->hw.rotation;
-	struct drm_format_name_buf format_name;
 
 	if (!fb)
 		return 0;

@@ -1168,9 +1167,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
 		case DRM_FORMAT_XVYU12_16161616:
 		case DRM_FORMAT_XVYU16161616:
 			drm_dbg_kms(&dev_priv->drm,
-				    "Unsupported pixel format %s for 90/270!\n",
-				    drm_get_format_name(fb->format->format,
-							&format_name));
+				    "Unsupported pixel format %p4cc for 90/270!\n",
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/i915/display/skl_universal_plane.c +1 -0
+				    &fb->format->format);
 			return -EINVAL;
 		default:
 			break;
Signature · 1 line
2.30.0

The above fix up patch now needs to be applied to the drm tree.

Quoted 1 line

I am still applying the above patch, but it applies to Linus' tree now.

I am going to stop applying this. You guys can apply it if you want to some time.

Signature · 2 lines
Cheers,
Stephen Rothwell
#7 lore raw

Hi

Am 14.05.21 um 03:53 schrieb Stephen Rothwell:

Quoted 26 lines

Hi all,

Quoted 23 lines · On Fri, 30 Apr 2021 08:23:21 +1000 Stephen Rothwell <[email protected]>…
Quoted 21 lines · On Thu, 18 Mar 2021 12:52:41 +1100 Stephen Rothwell <[email protected]>…
Quoted 19 lines · On Wed, 17 Mar 2021 14:08:24 +1100 Stephen Rothwell <[email protected]>…

Today's linux-next merge of the drm-intel tree got a conflict in:

drivers/gpu/drm/i915/display/intel_sprite.c

between commit:

92f1d09ca4ed ("drm: Switch to %p4cc format modifier")

from the drm tree and commit:

46d12f911821 ("drm/i915: migrate skl planes code new file (v5)")

from the drm-intel tree.

I fixed it up (I used the latter version of the file and applied the following 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

Quoted 41 lines
Quoted 41 lines
Quoted 40 lines
Quoted 38 lines

merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <[email protected]>
Date: Wed, 17 Mar 2021 14:05:42 +1100
Subject: [PATCH] merge fix for "drm: Switch to %p4cc format modifier"

Signed-off-by Stephen Rothwell <[email protected]>
---
  drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/skl_universal_plane.c +2 -4
index 1f335cb09149..45ceff436bf7 100644
@@ -1120,7 +1120,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
  	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
  	const struct drm_framebuffer *fb = plane_state->hw.fb;
  	unsigned int rotation = plane_state->hw.rotation;
-	struct drm_format_name_buf format_name;
 
  	if (!fb)
  		return 0;

@@ -1168,9 +1167,8 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state,
  		case DRM_FORMAT_XVYU12_16161616:
  		case DRM_FORMAT_XVYU16161616:
  			drm_dbg_kms(&dev_priv->drm,
-				    "Unsupported pixel format %s for 90/270!\n",
-				    drm_get_format_name(fb->format->format,
-							&format_name));
+				    "Unsupported pixel format %p4cc for 90/270!\n",
+				    &fb->format->format);
  			return -EINVAL;
  		default:
  			break;
Signature · 1 line
2.30.0

The above fix up patch now needs to be applied to the drm tree.

Quoted 5 lines
Quoted 1 line

I am still applying the above patch, but it applies to Linus' tree now.

I am going to stop applying this. You guys can apply it if you want to some time.

Sorry, this got lost several times. I've applied your patch to drm-misc-next now. Thanks a lot.

Best regards
Thomas

Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx