Skip to contentSkip to conversation

drm/i915: Force initial atomic check in all eDP panels

PATCH In review José Roberto de Souza 3 participants 7 messages Oct 28, 2020 – Oct 30, 2020

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

PATCH 1/1 drm/i915: Force initial atomic check in all eDP panels

After commit 00e5deb5c4f5 ("drm/i915: Fix encoder lookup during PSR atomic check") dig_port was not being used but while fixing it I realized that would be better to mark all CRTCs that has a eDP connector as needing to have their state computed.
The principal reason is that in future we will support PSR in multiple panels.
And this is only forcing the state compute if no register change is need our atomic handling will just ignore this CRTC + connector during the atomic commit phase.

---
 drivers/gpu/drm/i915/display/intel_psr.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +2 -8
index 1576c3722d0b..b5441f0b5b58 100644
@@ -1875,17 +1875,11 @@ void intel_psr_atomic_check(struct drm_connector *connector,
 			    struct drm_connector_state *new_state)
 {
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	struct intel_connector *intel_connector;
-	struct intel_digital_port *dig_port;
 	struct drm_crtc_state *crtc_state;
 
 	if (!CAN_PSR(dev_priv) || !new_state->crtc ||
-	    !dev_priv->psr.force_mode_changed)
-		return;
-
-	intel_connector = to_intel_connector(connector);
-	dig_port = enc_to_dig_port(to_intel_encoder(new_state->best_encoder));
-	if (dev_priv->psr.dp != &dig_port->dp)
+	    !dev_priv->psr.force_mode_changed ||
+	    connector->connector_type != DRM_MODE_CONNECTOR_eDP)
 		return;
 
 	crtc_state = drm_atomic_get_new_crtc_state(new_state->state,
Signature · 6 lines
2.29.1

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

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Force initial atomic check in all eDP panels

== Series Details ==

== Series Details ==

Series: drm/i915: Force initial atomic check in all eDP panels
URL : https://patchwork.freedesktop.org/series/83170/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_9214 -> Patchwork_18800
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

New tests
---------

New tests have been introduced between CI_DRM_9214 and Patchwork_18800:

### New CI tests (1) ###

* boot:
- Statuses : 39 pass(s)
- Exec time: [0.0] s

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

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

### IGT changes ###

#### Issues hit ####

* igt@core_hotunplug@unbind-rebind:
- fi-skl-lmem: [PASS][1] -> [DMESG-WARN][2] ([i915#2605])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-skl-lmem/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-skl-lmem/igt@[email protected]

* igt@i915_pm_rpm@module-reload:
- fi-kbl-7500u: [PASS][3] -> [DMESG-WARN][4] ([i915#203])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-kbl-7500u/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-byt-j1900: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-byt-j1900/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-byt-j1900/igt@[email protected]

* igt@prime_self_import@basic-with_one_bo_two_files:
- fi-tgl-y: [PASS][7] -> [DMESG-WARN][8] ([i915#402]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-tgl-y/igt@prime_self_import@basic-with_one_bo_two_files.html

#### Possible fixes ####

* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [DMESG-WARN][9] ([i915#402]) -> [PASS][10] +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-tgl-y/igt@debugfs_test@read_all_entries.html
- {fi-kbl-7560u}: [INCOMPLETE][11] ([i915#2417]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html

* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-apl-guc: [DMESG-WARN][13] ([i915#1635] / [i915#1982]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-apl-guc/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-apl-guc/igt@[email protected]

* igt@kms_busy@basic@flip:
- fi-kbl-soraka: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-kbl-soraka/igt@kms_busy@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-kbl-soraka/igt@kms_busy@[email protected]
- fi-tgl-y: [DMESG-WARN][17] ([i915#1982]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-tgl-y/igt@kms_busy@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-tgl-y/igt@kms_busy@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [DMESG-WARN][19] ([i915#1982]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-icl-u2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-icl-u2/igt@[email protected]

* igt@vgem_basic@unload:
- fi-skl-guc: [DMESG-WARN][21] ([i915#2203]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-skl-guc/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-skl-guc/igt@[email protected]

#### Warnings ####

* igt@core_hotunplug@unbind-rebind:
- fi-icl-u2: [DMESG-WARN][23] ([i915#289]) -> [DMESG-WARN][24] ([i915#1982] / [i915#289])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-icl-u2/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-icl-u2/igt@[email protected]

* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-tgl-y: [DMESG-WARN][25] ([i915#1982] / [i915#2411]) -> [DMESG-WARN][26] ([i915#2411])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/fi-tgl-y/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/fi-tgl-y/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#203]: https://gitlab.freedesktop.org/drm/intel/issues/203
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2417]: https://gitlab.freedesktop.org/drm/intel/issues/2417
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402

Participating hosts (41 -> 39)
------------------------------

Missing (2): fi-bsw-cyan fi-bdw-samus

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

* Linux: CI_DRM_9214 -> Patchwork_18800

CI-20190529: 20190529
CI_DRM_9214: c485050a56cf0edaed15b8297d5540bd0f4310b9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5827: 7fd7e3fb8b42eb4e62a4575f6edc5a048e5bec3d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18800: 67e741de264d5f59124982a4915278e1a17fcac4 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

67e741de264d drm/i915: Force initial atomic check in all eDP panels

== Logs ==

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

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

#2 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Force initial atomic check in all eDP panels

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

== Series Details ==

Series: drm/i915: Force initial atomic check in all eDP panels
URL : https://patchwork.freedesktop.org/series/83170/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_9214_full -> Patchwork_18800_full
====================================================

Summary
-------

**FAILURE**

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

If you think the reported changes have nothing to do with the changes introduced in Patchwork_18800_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_18800_full:

### IGT changes ###

#### Possible regressions ####

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-tglb: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-tglb7/igt@kms_flip@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-tglb2/igt@kms_flip@[email protected]

New tests
---------

New tests have been introduced between CI_DRM_9214_full and Patchwork_18800_full:

### New CI tests (1) ###

* boot:
- Statuses : 175 pass(s)
- Exec time: [0.0] s

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

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

### IGT changes ###

#### Issues hit ####

* igt@drm_read@empty-block:
- shard-glk: [PASS][3] -> [DMESG-WARN][4] ([i915#1982]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-glk1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-glk9/igt@[email protected]

* igt@gem_eio@kms:
- shard-snb: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-snb5/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-snb7/igt@[email protected]

* igt@gem_exec_create@basic:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#1888])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-glk2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-glk2/igt@[email protected]

* igt@gem_exec_create@madvise:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#1888] / [i915#2545])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-glk2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-glk2/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen:
- shard-skl: [PASS][11] -> [FAIL][12] ([i915#54]) +5 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl6/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled:
- shard-snb: [PASS][13] -> [SKIP][14] ([fdo#109271]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-snb7/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-snb2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-indfb-fliptrack:
- shard-tglb: [PASS][15] -> [DMESG-WARN][16] ([i915#1982]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-tglb1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-tglb3/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: [PASS][17] -> [DMESG-WARN][18] ([i915#1635] / [i915#1982]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-apl6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-apl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html

* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-iclb: [PASS][19] -> [DMESG-WARN][20] ([i915#1982])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-iclb3/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-iclb7/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-pwrite:
- shard-skl: [PASS][21] -> [DMESG-WARN][22] ([i915#1982]) +11 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl3/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-pwrite.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl4/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-pwrite.html

* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][23] -> [FAIL][24] ([i915#1188]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl10/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][25] -> [FAIL][26] ([fdo#108145] / [i915#265])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl1/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl1/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109642] / [fdo#111068])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-iclb2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-iclb4/igt@[email protected]

* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [PASS][29] -> [SKIP][30] ([fdo#109441]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-iclb4/igt@kms_psr@psr2_cursor_render.html

* igt@kms_setmode@basic:
- shard-apl: [PASS][31] -> [FAIL][32] ([i915#1635] / [i915#31])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-apl3/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-apl4/igt@[email protected]

#### Possible fixes ####

* igt@core_hotunplug@hotrebind-lateclose:
- shard-snb: [INCOMPLETE][33] ([i915#82]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-snb5/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-snb4/igt@[email protected]

* igt@gem_exec_schedule@timeslicing@vecs0:
- shard-skl: [DMESG-WARN][35] ([i915#1982]) -> [PASS][36] +7 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl8/igt@gem_exec_schedule@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl4/igt@gem_exec_schedule@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][37] ([i915#2190]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-tglb6/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-tglb3/igt@[email protected]

* igt@gem_ppgtt@blt-vs-render-ctx0:
- shard-snb: [DMESG-FAIL][39] -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-snb7/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-snb4/igt@[email protected]

* igt@i915_suspend@forcewake:
- shard-skl: [INCOMPLETE][41] ([i915#636]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl8/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl8/igt@[email protected]

* {igt@kms_async_flips@alternate-sync-async-flip}:
- shard-skl: [FAIL][43] ([i915#2521]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl4/igt@[email protected]

* igt@kms_cursor_crc@pipe-c-cursor-256x85-sliding:
- shard-skl: [FAIL][45] ([i915#54]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl6/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-b-256x256-bottom-edge:
- shard-glk: [DMESG-WARN][47] ([i915#1982]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-glk8/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-glk7/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-c-128x128-right-edge:
- shard-apl: [DMESG-WARN][49] ([i915#1635] / [i915#1982]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-apl1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-apl1/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-skl: [FAIL][51] ([i915#2346]) -> [PASS][52] +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-skl7/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-skl9/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy:
- shard-tglb: [FAIL][53] ([i915#2346]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-tglb6/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-tglb5/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][55] ([i915#2122]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-glk1/igt@kms_flip@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-glk2/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-kbl: [DMESG-WARN][57] ([i915#1982]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-kbl6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html

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

* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-kbl: [DMESG-WARN][61] ([i915#165] / [i915#78]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-kbl2/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-kbl7/igt@[email protected]

* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][63] ([fdo#109441]) -> [PASS][64] +3 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-iclb7/igt@kms_psr@psr2_primary_page_flip.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html

#### Warnings ####

* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][65] ([i915#1515]) -> [FAIL][66] ([i915#1515])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-iclb5/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-iclb3/igt@[email protected]

* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][67] ([fdo#109349]) -> [DMESG-WARN][68] ([i915#1226])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9214/shard-iclb5/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18800/shard-iclb2/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#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#1515]: https://gitlab.freedesktop.org/drm/intel/issues/1515
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2545]: https://gitlab.freedesktop.org/drm/intel/issues/2545
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#636]: https://gitlab.freedesktop.org/drm/intel/issues/636
[i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82

Participating hosts (11 -> 11)
------------------------------

No changes in participating hosts

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

* Linux: CI_DRM_9214 -> Patchwork_18800

CI-20190529: 20190529
CI_DRM_9214: c485050a56cf0edaed15b8297d5540bd0f4310b9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5827: 7fd7e3fb8b42eb4e62a4575f6edc5a048e5bec3d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18800: 67e741de264d5f59124982a4915278e1a17fcac4 @ 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_18800/index.html

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

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

After commit 00e5deb5c4f5 ("drm/i915: Fix encoder lookup during PSR atomic check") dig_port was not being used but while fixing it I realized that would be better to mark all CRTCs that has a eDP connector as needing to have their state computed.
The principal reason is that in future we will support PSR in multiple panels.
And this is only forcing the state compute if no register change is need our atomic handling will just ignore this CRTC + connector during the atomic commit phase.

---
 drivers/gpu/drm/i915/display/intel_psr.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +0 -0
index 1576c3722d0b..b5441f0b5b58 100644

drivers/gpu/drm/i915/display/intel_psr.c void intel_psr_atomic_check(struct drm_connector *connector, · line 1878

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_psr.c +0 -1
@@ -1875,17 +1875,11 @@ void intel_psr_atomic_check(struct drm_connector *connector,
 			    struct drm_connector_state *new_state)
 {
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	struct intel_connector *intel_connector;

Arg, compiler didn't warn for this.

drivers/gpu/drm/i915/display/intel_psr.c void intel_psr_atomic_check(struct drm_connector *connector, · line 1883

Quoted 13 lines
drivers/gpu/drm/i915/display/intel_psr.c +2 -7
-	struct intel_digital_port *dig_port;
 	struct drm_crtc_state *crtc_state;
 
 	if (!CAN_PSR(dev_priv) || !new_state->crtc ||
-	    !dev_priv->psr.force_mode_changed)
-		return;
-
-	intel_connector = to_intel_connector(connector);
-	dig_port = enc_to_dig_port(to_intel_encoder(new_state->best_encoder));
-	if (dev_priv->psr.dp != &dig_port->dp)
+	    !dev_priv->psr.force_mode_changed ||
+	    connector->connector_type != DRM_MODE_CONNECTOR_eDP)
 		return;

Can't you simplify even more by an is_edp && CAN_PSR check in intel_dp_initial_fastset_check() instead of the psr.force_mode_changed logic?

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_psr.c +0 -0
 	crtc_state = drm_atomic_get_new_crtc_state(new_state->state,
Signature · 1 line
2.29.1

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

#4 lore raw
Quoted 35 lines · Imre Deak
Quoted 21 lines · José Roberto de Souza

After commit 00e5deb5c4f5 ("drm/i915: Fix encoder lookup during PSR atomic check") dig_port was not being used but while fixing it I realized that would be better to mark all CRTCs that has a eDP connector as needing to have their state computed.
The principal reason is that in future we will support PSR in multiple panels.
And this is only forcing the state compute if no register change is need our atomic handling will just ignore this CRTC + connector during the atomic commit phase.

---
 drivers/gpu/drm/i915/display/intel_psr.c | 10 ++--------

 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +0 -0
index 1576c3722d0b..b5441f0b5b58 100644

drivers/gpu/drm/i915/display/intel_psr.c void intel_psr_atomic_check(struct drm_connector *connector, · line 1878

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_psr.c +0 -1
@@ -1875,17 +1875,11 @@ void intel_psr_atomic_check(struct drm_connector *connector,
  			    struct drm_connector_state *new_state)
  {
  	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	struct intel_connector *intel_connector;

Arg, compiler didn't warn for this.

Quoted 6 lines
drivers/gpu/drm/i915/display/intel_psr.c +0 -1
-	struct intel_digital_port *dig_port;
  	struct drm_crtc_state *crtc_state;

Quoted 14 lines
Quoted 10 lines

  if (!CAN_PSR(dev_priv) || !new_state->crtc ||

drivers/gpu/drm/i915/display/intel_psr.c +2 -6
-	    !dev_priv->psr.force_mode_changed)
-		return;
-
-	intel_connector = to_intel_connector(connector);
-	dig_port = enc_to_dig_port(to_intel_encoder(new_state->best_encoder));
-	if (dev_priv->psr.dp != &dig_port->dp)
+	    !dev_priv->psr.force_mode_changed ||
+	    connector->connector_type != DRM_MODE_CONNECTOR_eDP)

  return;

Can't you simplify even more by an is_edp && CAN_PSR check in intel_dp_initial_fastset_check() instead of the psr.force_mode_changed logic?

In the past we ha problems forcing a modeset from the initial commit but with this new callback I guess it was fixed. I sent a test to try-bot, if that work we simply and remove some more code around it.

thanks for the headsup.

Quoted 9 lines
Quoted 9 lines

  crtc_state = drm_atomic_get_new_crtc_state(new_state->state,

Signature · 1 line
2.29.1

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

#5 lore raw
Quoted 51 lines · Jose
Quoted 35 lines · Imre Deak
Quoted 21 lines · José Roberto de Souza

After commit 00e5deb5c4f5 ("drm/i915: Fix encoder lookup during PSR atomic check") dig_port was not being used but while fixing it I realized that would be better to mark all CRTCs that has a eDP connector as needing to have their state computed.
The principal reason is that in future we will support PSR in multiple panels.
And this is only forcing the state compute if no register change is need our atomic handling will just ignore this CRTC + connector during the atomic commit phase.

---
 drivers/gpu/drm/i915/display/intel_psr.c | 10 ++--------

 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +0 -0
index 1576c3722d0b..b5441f0b5b58 100644

drivers/gpu/drm/i915/display/intel_psr.c void intel_psr_atomic_check(struct drm_connector *connector, · line 1878

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_psr.c +0 -1
@@ -1875,17 +1875,11 @@ void intel_psr_atomic_check(struct drm_connector *connector,
  			    struct drm_connector_state *new_state)
  {
  	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	struct intel_connector *intel_connector;

Arg, compiler didn't warn for this.

Quoted 6 lines
drivers/gpu/drm/i915/display/intel_psr.c +0 -1
-	struct intel_digital_port *dig_port;
  	struct drm_crtc_state *crtc_state;

Quoted 14 lines
Quoted 10 lines

  if (!CAN_PSR(dev_priv) || !new_state->crtc ||

drivers/gpu/drm/i915/display/intel_psr.c +2 -6
-	    !dev_priv->psr.force_mode_changed)
-		return;
-
-	intel_connector = to_intel_connector(connector);
-	dig_port = enc_to_dig_port(to_intel_encoder(new_state->best_encoder));
-	if (dev_priv->psr.dp != &dig_port->dp)
+	    !dev_priv->psr.force_mode_changed ||
+	    connector->connector_type != DRM_MODE_CONNECTOR_eDP)

  return;

Can't you simplify even more by an is_edp && CAN_PSR check in intel_dp_initial_fastset_check() instead of the psr.force_mode_changed logic?

Quoted 2 lines

In the past we ha problems forcing a modeset from the initial commit but with this new callback I guess it was fixed.

Ok. Note that now a forced initial modeset can anyway happen due to other reasons (DSC, wrong DP link rate). Also imo the only way to guarantee enabling PSR (the purpose of psr.force_mode_changed afaiu) is to do it in the initial modeset, (no subsequent modeset is guaranteed).

Quoted 2 lines

I sent a test to try-bot, if that work we simply and remove some more code around it.

Ok.

Quoted 1 line

thanks for the headsup.

The fastset hook was just recently added, so thought it's better to have all similar modeset forcing at one place. Btw, if intel_pipe_config_compare() wouldn't show a mismatch for the PSR state (I suppose it doesn't) then intel_crtc_check_fastset() will reset mode_changed, so probably better to use connectors_changed.

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

#6 lore raw
Quoted 5 lines · Imre Deak

[...]

Btw, if intel_pipe_config_compare() wouldn't show a mismatch for the PSR state (I suppose it doesn't) then intel_crtc_check_fastset() will reset mode_changed, so probably better to use connectors_changed.

Ah, nvm, PSR will get enabled even during a fastset, so you don't want to force a full modeset -> mode_changed is ok.

Quoted 6 lines

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

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