Skip to contentSkip to conversation

drm/damage_helper: Fix handling of cursor dirty buffers

PATCH In review José Roberto de Souza 3 participants 6 messages Aug 17, 2021 – Aug 19, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/damage_helper: Fix handling of cursor dirty buffers

Cursors don't have a framebuffer so the fb comparisson was always failing and atomic state was being committed without any plane state.

So here checking if objects match when checking cursors.

Fixes b9fc5e01d1ce ("drm: Add helper to implement legacy dirtyfb")
Cc Daniel Vetter <[email protected]>
Cc Rob Clark <[email protected]>
Cc Deepak Rawat <[email protected]>
Cc Gwan-gyeong Mun <[email protected]>
---
 drivers/gpu/drm/drm_damage_helper.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_damage_helper.c +7 -1
index 8eeff0c7bdd47..595187d97c131 100644
@@ -157,12 +157,18 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
 retry:
 	drm_for_each_plane(plane, fb->dev) {
 		struct drm_plane_state *plane_state;
+		bool match;
 
 		ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx);
 		if (ret)
 			goto out;
 
-		if (plane->state->fb != fb) {
+		match = plane->state->fb == fb;
+		/* Check if objs match to handle dirty buffers of cursors */
+		if (plane->type == DRM_PLANE_TYPE_CURSOR && plane->state->fb)
+			match |= fb->obj[0] == plane->state->fb->obj[0];
+
+		if (!match) {
 			drm_modeset_unlock(&plane->mutex);
 			continue;
 		}
Signature · 1 line
2.32.0
#1 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/damage_helper: Fix handling of cursor dirty buffers

== Series Details ==

== Series Details ==

Series: drm/damage_helper: Fix handling of cursor dirty buffers
URL : https://patchwork.freedesktop.org/series/93765/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10491 -> Patchwork_20839
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@amdgpu/amd_basic@cs-gfx:
- fi-rkl-guc: NOTRUN -> [SKIP][1] ([fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-rkl-guc/igt@amdgpu/[email protected]
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271]) +20 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-kbl-soraka/igt@amdgpu/[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][4] ([i915#1886] / [i915#2291])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [fdo#111827]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-kbl-soraka/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#533])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-kbl-soraka/igt@[email protected]

#### Possible fixes ####

* igt@core_hotunplug@unbind-rebind:
- fi-rkl-guc: [DMESG-WARN][7] ([i915#3925]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/fi-rkl-guc/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-rkl-guc/igt@[email protected]
- fi-ilk-650: [DMESG-WARN][9] ([i915#164]) -> [PASS][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/fi-ilk-650/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-ilk-650/igt@[email protected]

* igt@gem_exec_suspend@basic-s0:
- fi-kbl-soraka: [INCOMPLETE][11] ([i915#155]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/fi-kbl-soraka/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@execlists:
- {fi-tgl-dsi}: [DMESG-FAIL][13] ([i915#1993]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/fi-tgl-dsi/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/fi-tgl-dsi/igt@i915_selftest@[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#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#164]: https://gitlab.freedesktop.org/drm/intel/issues/164
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#1993]: https://gitlab.freedesktop.org/drm/intel/issues/1993
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#3925]: https://gitlab.freedesktop.org/drm/intel/issues/3925
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533

Participating hosts (36 -> 33)
------------------------------

Missing (3): fi-bdw-samus fi-bsw-cyan fi-apl-guc

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

* Linux: CI_DRM_10491 -> Patchwork_20839

CI-20190529: 20190529
CI_DRM_10491: efa09f306ade4b8550404d7248ac743fc0cb2c7d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6177: f474644e7226dd319195ca03b3cde82ad10ac54c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20839: 8ccb68e74c2246f70ce5216c06afed3e88e804f4 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

8ccb68e74c22 drm/damage_helper: Fix handling of cursor dirty buffers

== Logs ==

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

#2 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/damage_helper: Fix handling of cursor dirty buffers

In reply to José Roberto de Souza
== Series Details ==

== Series Details ==

Series: drm/damage_helper: Fix handling of cursor dirty buffers
URL : https://patchwork.freedesktop.org/series/93765/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_10491_full -> Patchwork_20839_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_20839_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_20839_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_20839_full:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_fair@basic-pace@vcs0:
- shard-kbl: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-kbl6/igt@gem_exec_fair@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl1/igt@gem_exec_fair@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@feature_discovery@display-2x:
- shard-iclb: NOTRUN -> [SKIP][3] ([i915#1839])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@gem_create@create-massive:
- shard-apl: NOTRUN -> [DMESG-WARN][4] ([i915#3002])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl6/igt@[email protected]

* igt@gem_ctx_isolation@preservation-s3@rcs0:
- shard-apl: NOTRUN -> [DMESG-WARN][5] ([i915#180]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl8/igt@gem_ctx_isolation@[email protected]

* igt@gem_ctx_persistence@idempotent:
- shard-snb: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#1099]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-snb5/igt@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][7] -> [TIMEOUT][8] ([i915#2369] / [i915#3063] / [i915#3648])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-tglb6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb7/igt@[email protected]

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-tglb: [PASS][9] -> [FAIL][10] ([i915#2842])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-tglb7/igt@gem_exec_fair@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: [PASS][11] -> [FAIL][12] ([i915#2842])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-apl6/igt@gem_exec_fair@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][13] ([i915#2842]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-glk: [PASS][14] -> [FAIL][15] ([i915#2842])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-glk5/igt@gem_exec_fair@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-glk7/igt@gem_exec_fair@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-kbl: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#2190])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@[email protected]

* igt@gem_mmap_gtt@big-copy-odd:
- shard-glk: [PASS][17] -> [FAIL][18] ([i915#1888] / [i915#307])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-glk5/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-glk9/igt@[email protected]

* igt@gem_pread@exhaustion:
- shard-apl: NOTRUN -> [WARN][19] ([i915#2658]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl1/igt@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-tglb: NOTRUN -> [WARN][20] ([i915#2658])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb7/igt@[email protected]

* igt@gem_render_copy@y-tiled-to-vebox-yf-tiled:
- shard-iclb: NOTRUN -> [SKIP][21] ([i915#768])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@gem_userptr_blits@dmabuf-sync:
- shard-tglb: NOTRUN -> [SKIP][22] ([i915#3323])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@gem_userptr_blits@dmabuf-unsync:
- shard-iclb: NOTRUN -> [SKIP][23] ([i915#3297]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-tglb: NOTRUN -> [SKIP][24] ([i915#3297]) +3 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@gem_userptr_blits@vma-merge:
- shard-apl: NOTRUN -> [FAIL][25] ([i915#3318])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl6/igt@[email protected]

* igt@gen3_mixed_blits:
- shard-iclb: NOTRUN -> [SKIP][26] ([fdo#109289])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@gen3_mixed_blits.html

* igt@gen3_render_tiledx_blits:
- shard-tglb: NOTRUN -> [SKIP][27] ([fdo#109289])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@gen3_render_tiledx_blits.html

* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][28] -> [DMESG-WARN][29] ([i915#1436] / [i915#716])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl1/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl7/igt@[email protected]

* igt@gen9_exec_parse@batch-invalid-length:
- shard-snb: NOTRUN -> [SKIP][30] ([fdo#109271]) +443 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-snb5/igt@[email protected]

* igt@gen9_exec_parse@bb-start-out:
- shard-iclb: NOTRUN -> [SKIP][31] ([i915#2856])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@gen9_exec_parse@bb-start-param:
- shard-tglb: NOTRUN -> [SKIP][32] ([i915#2856]) +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@i915_pm_dc@dc6-dpms:
- shard-tglb: NOTRUN -> [FAIL][33] ([i915#454])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@i915_pm_rpm@modeset-non-lpsp:
- shard-iclb: NOTRUN -> [SKIP][34] ([fdo#110892])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@kms_addfb_basic@invalid-smem-bo-on-discrete:
- shard-tglb: NOTRUN -> [SKIP][35] ([i915#3826])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_atomic@plane-primary-overlay-mutable-zpos:
- shard-tglb: NOTRUN -> [SKIP][36] ([i915#404])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_big_fb@y-tiled-64bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][37] ([fdo#110725] / [fdo#111614])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@kms_big_fb@yf-tiled-8bpp-rotate-180:
- shard-tglb: NOTRUN -> [SKIP][38] ([fdo#111615]) +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb7/igt@[email protected]

* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#3777]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl8/igt@[email protected]

* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#3886]) +16 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl1/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][41] ([fdo#109271] / [i915#3886]) +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][42] ([i915#3689]) +7 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_ccs.html

* igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-iclb: NOTRUN -> [SKIP][43] ([fdo#109278] / [i915#3886])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][44] ([i915#3689] / [i915#3886])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb7/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-d-crc-primary-rotation-180-yf_tiled_ccs:
- shard-iclb: NOTRUN -> [SKIP][45] ([fdo#109278]) +10 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@kms_ccs@pipe-d-crc-primary-rotation-180-yf_tiled_ccs.html

* igt@kms_cdclk@plane-scaling:
- shard-tglb: NOTRUN -> [SKIP][46] ([i915#3742])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_chamelium@dp-audio-edid:
- shard-skl: NOTRUN -> [SKIP][47] ([fdo#109271] / [fdo#111827])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl1/igt@[email protected]

* igt@kms_chamelium@dp-edid-read:
- shard-snb: NOTRUN -> [SKIP][48] ([fdo#109271] / [fdo#111827]) +20 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-snb5/igt@[email protected]

* igt@kms_chamelium@hdmi-crc-nonplanar-formats:
- shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109284] / [fdo#111827]) +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@kms_color@pipe-d-ctm-green-to-red:
- shard-iclb: NOTRUN -> [SKIP][50] ([fdo#109278] / [i915#1149])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@kms_color_chamelium@pipe-c-ctm-0-25:
- shard-apl: NOTRUN -> [SKIP][51] ([fdo#109271] / [fdo#111827]) +25 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl7/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][52] ([fdo#109271] / [fdo#111827]) +6 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl2/igt@[email protected]

* igt@kms_color_chamelium@pipe-c-degamma:
- shard-tglb: NOTRUN -> [SKIP][53] ([fdo#109284] / [fdo#111827]) +3 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_content_protection@atomic:
- shard-iclb: NOTRUN -> [SKIP][54] ([fdo#109300] / [fdo#111066])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@kms_content_protection@atomic-dpms:
- shard-apl: NOTRUN -> [TIMEOUT][55] ([i915#1319]) +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl8/igt@[email protected]

* igt@kms_content_protection@lic:
- shard-tglb: NOTRUN -> [SKIP][56] ([fdo#111828])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-32x32-random:
- shard-tglb: NOTRUN -> [SKIP][57] ([i915#3319])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb7/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-apl: [PASS][58] -> [DMESG-WARN][59] ([i915#180])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-apl8/igt@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl1/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-512x170-sliding:
- shard-tglb: NOTRUN -> [SKIP][60] ([fdo#109279] / [i915#3359]) +1 similar issue
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-max-size-sliding:
- shard-tglb: NOTRUN -> [SKIP][61] ([i915#3359]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_cursor_legacy@cursora-vs-flipb-varying-size:
- shard-iclb: NOTRUN -> [SKIP][62] ([fdo#109274] / [fdo#109278])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy:
- shard-apl: [PASS][63] -> [DMESG-WARN][64] ([IGT#6])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-apl6/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl7/igt@[email protected]

* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-apl: NOTRUN -> [SKIP][65] ([fdo#109271] / [i915#533]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl8/igt@[email protected]

* igt@kms_dither@fb-8bpc-vs-panel-8bpc@edp-1-pipe-a:
- shard-iclb: [PASS][66] -> [SKIP][67] ([i915#3788])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-iclb7/igt@kms_dither@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb2/igt@kms_dither@[email protected]

* igt@kms_dsc@basic-dsc-enable:
- shard-iclb: NOTRUN -> [SKIP][68] ([i915#3840])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

* igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible:
- shard-tglb: NOTRUN -> [SKIP][69] ([fdo#111825]) +20 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@kms_flip@2x-flip-vs-absolute-wf_vblank-interruptible.html

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [PASS][70] -> [FAIL][71] ([i915#79]) +1 similar issue
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl5/igt@kms_flip@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl2/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1:
- shard-glk: [PASS][72] -> [FAIL][73] ([i915#79])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-glk9/igt@kms_flip@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-glk8/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@c-dp1:
- shard-kbl: [PASS][74] -> [FAIL][75] ([i915#79])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-kbl6/igt@kms_flip@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl1/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@b-edp1:
- shard-skl: NOTRUN -> [INCOMPLETE][76] ([i915#198])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl10/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite:
- shard-iclb: NOTRUN -> [SKIP][77] ([fdo#109280]) +9 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite.html

* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-indfb-msflip-blt:
- shard-kbl: NOTRUN -> [SKIP][78] ([fdo#109271]) +57 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-indfb-msflip-blt.html

* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][79] -> [FAIL][80] ([i915#1188])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl8/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl6/igt@[email protected]

* igt@kms_multipipe_modeset@basic-max-pipe-crc-check:
- shard-tglb: NOTRUN -> [SKIP][81] ([i915#1839])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][82] ([fdo#109271] / [i915#533])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-skl: [PASS][83] -> [INCOMPLETE][84] ([i915#146] / [i915#198])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl5/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl9/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-apl: NOTRUN -> [FAIL][85] ([fdo#108145] / [i915#265]) +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl8/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
- shard-kbl: NOTRUN -> [FAIL][86] ([fdo#108145] / [i915#265])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][87] ([i915#265])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl3/igt@[email protected]

* igt@kms_plane_lowres@pipe-d-tiling-x:
- shard-tglb: NOTRUN -> [SKIP][88] ([i915#3536]) +1 similar issue
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-apl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#658]) +6 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl7/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-tglb: NOTRUN -> [SKIP][90] ([i915#2920])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-3:
- shard-kbl: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#658])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@[email protected]

* igt@kms_psr@psr2_cursor_plane_move:
- shard-tglb: NOTRUN -> [FAIL][92] ([i915#132] / [i915#3467])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@kms_psr@psr2_cursor_plane_move.html

* igt@kms_psr@psr2_cursor_render:
- shard-iclb: NOTRUN -> [SKIP][93] ([fdo#109441])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@kms_psr@psr2_cursor_render.html

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][94] -> [SKIP][95] ([fdo#109441]) +1 similar issue
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb8/igt@kms_psr@psr2_sprite_plane_move.html

* igt@kms_vrr@flipline:
- shard-tglb: NOTRUN -> [SKIP][96] ([fdo#109502])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@[email protected]

* igt@kms_writeback@writeback-fb-id:
- shard-apl: NOTRUN -> [SKIP][97] ([fdo#109271] / [i915#2437]) +1 similar issue
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl8/igt@[email protected]

* igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame:
- shard-apl: NOTRUN -> [SKIP][98] ([fdo#109271]) +282 similar issues
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-apl2/igt@[email protected]

* igt@prime_nv_api@i915_self_import:
- shard-iclb: NOTRUN -> [SKIP][99] ([fdo#109291]) +1 similar issue
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@prime_nv_api@i915_self_import.html

* igt@prime_nv_api@nv_self_import:
- shard-skl: NOTRUN -> [SKIP][100] ([fdo#109271])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl1/igt@prime_nv_api@nv_self_import.html

* igt@prime_nv_test@i915_import_pread_pwrite:
- shard-tglb: NOTRUN -> [SKIP][101] ([fdo#109291])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb8/igt@prime_nv_test@i915_import_pread_pwrite.html

* igt@sysfs_clients@recycle:
- shard-iclb: NOTRUN -> [SKIP][102] ([i915#2994])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@[email protected]

#### Possible fixes ####

* igt@gem_create@create-clear:
- shard-glk: [FAIL][103] ([i915#1888] / [i915#3160]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-glk8/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-glk4/igt@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][105] ([i915#2846]) -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-glk7/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-glk4/igt@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][107] ([i915#2842]) -> [PASS][108] +2 similar issues
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-kbl7/igt@gem_exec_fair@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [FAIL][109] ([i915#2842]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-tglb5/igt@gem_exec_fair@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-tglb5/igt@gem_exec_fair@[email protected]

* igt@i915_suspend@forcewake:
- shard-kbl: [INCOMPLETE][111] ([i915#155] / [i915#636]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-kbl4/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@[email protected]

* igt@kms_color@pipe-a-ctm-0-25:
- shard-skl: [DMESG-WARN][113] ([i915#1982]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl8/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl6/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [FAIL][115] ([i915#2122]) -> [PASS][116]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl5/igt@kms_flip@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl2/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@a-edp1:
- shard-skl: [INCOMPLETE][117] ([i915#198]) -> [PASS][118]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl3/igt@kms_flip@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl10/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-edp1:
- shard-iclb: [INCOMPLETE][119] ([i915#2910]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-iclb3/igt@kms_flip@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb3/igt@kms_flip@[email protected]

* igt@kms_flip_tiling@flip-to-yf-tiled@edp-1-pipe-a:
- shard-skl: [FAIL][121] -> [PASS][122]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl7/igt@kms_flip_tiling@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl8/igt@kms_flip_tiling@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-kbl: [DMESG-WARN][123] ([i915#180]) -> [PASS][124] +1 similar issue
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-kbl1/igt@kms_plane@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-kbl4/igt@kms_plane@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][125] ([fdo#108145] / [i915#265]) -> [PASS][126]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl10/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl4/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][127] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][128]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-iclb7/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb2/igt@[email protected]

* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [SKIP][129] ([fdo#109441]) -> [PASS][130] +2 similar issues
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-iclb4/igt@kms_psr@psr2_no_drrs.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb2/igt@kms_psr@psr2_no_drrs.html

* igt@perf@polling:
- shard-skl: [FAIL][131] ([i915#1542]) -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-skl3/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-skl10/igt@[email protected]

#### Warnings ####

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][133] ([i915#2842]) -> [FAIL][134] ([i915#2849])
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-iclb3/igt@gem_exec_fair@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb1/igt@gem_exec_fair@[email protected]

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][135] ([i915#2684]) -> [WARN][136] ([i915#1804] / [i915#2684])
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10491/shard-iclb5/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20839/shard-iclb4/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:

== Logs ==

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

#3 lore raw
In reply to José Roberto de Souza
Quoted 4 lines · José Roberto de Souza

Cursors don't have a framebuffer so the fb comparisson was always failing and atomic state was being committed without any plane state.

So here checking if objects match when checking cursors.

This looks extremely backwards ... what exactly is this fixing? If this isn't based on a real world compositor usage but some igt, then I'd say the igt here is very wrong.
-Daniel

Quoted 37 lines
Fixes b9fc5e01d1ce ("drm: Add helper to implement legacy dirtyfb")
Cc Daniel Vetter <[email protected]>
Cc Rob Clark <[email protected]>
Cc Deepak Rawat <[email protected]>
Cc Gwan-gyeong Mun <[email protected]>
---
 drivers/gpu/drm/drm_damage_helper.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_damage_helper.c +7 -1
index 8eeff0c7bdd47..595187d97c131 100644
@@ -157,12 +157,18 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
 retry:
 	drm_for_each_plane(plane, fb->dev) {
 		struct drm_plane_state *plane_state;
+		bool match;
 
 		ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx);
 		if (ret)
 			goto out;
 
-		if (plane->state->fb != fb) {
+		match = plane->state->fb == fb;
+		/* Check if objs match to handle dirty buffers of cursors */
+		if (plane->type == DRM_PLANE_TYPE_CURSOR && plane->state->fb)
+			match |= fb->obj[0] == plane->state->fb->obj[0];
+
+		if (!match) {
 			drm_modeset_unlock(&plane->mutex);
 			continue;
 		}
Signature · 1 line
2.32.0
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
#4 lore raw
Quoted 9 lines · Daniel Vetter
Quoted 4 lines · José Roberto de Souza

Cursors don't have a framebuffer so the fb comparisson was always failing and atomic state was being committed without any plane state.

So here checking if objects match when checking cursors.

This looks extremely backwards ... what exactly is this fixing? If this isn't based on a real world compositor usage but some igt, then I'd say the igt here is very wrong.

Yes it is IGT.
Writing to cursor buffer current in the screen and calling drmModeDirtyFB() causes a empty atomic commit by drm_atomic_helper_dirtyfb().

Quoted 40 lines

-Daniel

Quoted 37 lines
Fixes b9fc5e01d1ce ("drm: Add helper to implement legacy dirtyfb")
Cc Daniel Vetter <[email protected]>
Cc Rob Clark <[email protected]>
Cc Deepak Rawat <[email protected]>
Cc Gwan-gyeong Mun <[email protected]>
---
 drivers/gpu/drm/drm_damage_helper.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_damage_helper.c +7 -1
index 8eeff0c7bdd47..595187d97c131 100644
@@ -157,12 +157,18 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
 retry:
 	drm_for_each_plane(plane, fb->dev) {
 		struct drm_plane_state *plane_state;
+		bool match;
 
 		ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx);
 		if (ret)
 			goto out;
 
-		if (plane->state->fb != fb) {
+		match = plane->state->fb == fb;
+		/* Check if objs match to handle dirty buffers of cursors */
+		if (plane->type == DRM_PLANE_TYPE_CURSOR && plane->state->fb)
+			match |= fb->obj[0] == plane->state->fb->obj[0];
+
+		if (!match) {
 			drm_modeset_unlock(&plane->mutex);
 			continue;
 		}
Signature · 1 line
2.32.0
#5 lore raw
Quoted 7 lines · Jose
Quoted 6 lines · Daniel Vetter
Quoted 4 lines · José Roberto de Souza

Cursors don't have a framebuffer so the fb comparisson was always failing and atomic state was being committed without any plane state.

So here checking if objects match when checking cursors.

Quoted 8 lines
Quoted 3 lines

This looks extremely backwards ... what exactly is this fixing? If this isn't based on a real world compositor usage but some igt, then I'd say the igt here is very wrong.

Yes it is IGT.
Writing to cursor buffer current in the screen and calling drmModeDirtyFB() causes a empty atomic commit by drm_atomic_helper_dirtyfb().

Ok if the cursor write is done through legacy cursor uapi then trying to make that work with dirtyfb doesn't make sense.

But you've found a bug at least, namely the empty commit. I think that should be filtered out, and our dirtyfb testcases (I hope we have some vendor-agnostic kms_dirtyfb already) should be extended with a testcase where we call dirtyfb on an fb which is not currently used anywhere.

Wrt the cursor: The legacy cursor ioctls get remapped onto the cursor plane, which means they come in as full commits. So there's really not dirtyfb required afterwards. The funny thing about the cursor ioctls is that they never supported frontbuffer rendering. You _always_ had to call them to upload data. So the test is invalid from a functional pov too. -Daniel

Quoted 43 lines
Quoted 42 lines

-Daniel

Quoted 37 lines
Fixes b9fc5e01d1ce ("drm: Add helper to implement legacy dirtyfb")
Cc Daniel Vetter <[email protected]>
Cc Rob Clark <[email protected]>
Cc Deepak Rawat <[email protected]>
Cc Gwan-gyeong Mun <[email protected]>
---
 drivers/gpu/drm/drm_damage_helper.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_damage_helper.c +7 -1
index 8eeff0c7bdd47..595187d97c131 100644
@@ -157,12 +157,18 @@ int drm_atomic_helper_dirtyfb(struct drm_framebuffer *fb,
 retry:
 	drm_for_each_plane(plane, fb->dev) {
 		struct drm_plane_state *plane_state;
+		bool match;
 
 		ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx);
 		if (ret)
 			goto out;
 
-		if (plane->state->fb != fb) {
+		match = plane->state->fb == fb;
+		/* Check if objs match to handle dirty buffers of cursors */
+		if (plane->type == DRM_PLANE_TYPE_CURSOR && plane->state->fb)
+			match |= fb->obj[0] == plane->state->fb->obj[0];
+
+		if (!match) {
 			drm_modeset_unlock(&plane->mutex);
 			continue;
 		}
Signature · 1 line
2.32.0
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch