* [Intel-gfx] [PATCH] drm/i915: Properly flag modesets for all bigjoiner pipes
@ 2020-11-20 16:01 Ville Syrjala
2020-11-20 17:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ville Syrjala @ 2020-11-20 16:01 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
If either of the bigjoiner pipes needs a modeset then we need
a modeset on both pipes. Make it so.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 40 ++++++++++++--------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 595183f7b60f..321321230a55 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15355,21 +15355,16 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
return -EINVAL;
}
-static int kill_bigjoiner_slave(struct intel_atomic_state *state,
- struct intel_crtc_state *master_crtc_state)
+static void kill_bigjoiner_slave(struct intel_atomic_state *state,
+ struct intel_crtc_state *master_crtc_state)
{
struct intel_crtc_state *slave_crtc_state =
- intel_atomic_get_crtc_state(&state->base,
- master_crtc_state->bigjoiner_linked_crtc);
-
- if (IS_ERR(slave_crtc_state))
- return PTR_ERR(slave_crtc_state);
+ intel_atomic_get_new_crtc_state(state, master_crtc_state->bigjoiner_linked_crtc);
slave_crtc_state->bigjoiner = master_crtc_state->bigjoiner = false;
slave_crtc_state->bigjoiner_slave = master_crtc_state->bigjoiner_slave = false;
slave_crtc_state->bigjoiner_linked_crtc = master_crtc_state->bigjoiner_linked_crtc = NULL;
intel_crtc_copy_uapi_to_hw_state(state, slave_crtc_state);
- return 0;
}
/**
@@ -15507,7 +15502,7 @@ static int intel_atomic_check_async(struct intel_atomic_state *state)
static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
{
- const struct intel_crtc_state *crtc_state;
+ struct intel_crtc_state *crtc_state;
struct intel_crtc *crtc;
int i;
@@ -15521,6 +15516,16 @@ static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
crtc_state->bigjoiner_linked_crtc);
if (IS_ERR(linked_crtc_state))
return PTR_ERR(linked_crtc_state);
+
+ if (needs_modeset(crtc_state))
+ linked_crtc_state->uapi.mode_changed = true;
+ }
+
+ for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
+ /* Kill old bigjoiner link, we may re-establish afterwards */
+ if (needs_modeset(crtc_state) &&
+ crtc_state->bigjoiner && !crtc_state->bigjoiner_slave)
+ kill_bigjoiner_slave(state, crtc_state);
}
return 0;
@@ -15564,13 +15569,6 @@ static int intel_atomic_check(struct drm_device *dev,
continue;
}
- /* Kill old bigjoiner link, we may re-establish afterwards */
- if (old_crtc_state->bigjoiner && !old_crtc_state->bigjoiner_slave) {
- ret = kill_bigjoiner_slave(state, new_crtc_state);
- if (ret)
- goto fail;
- }
-
if (!new_crtc_state->uapi.enable) {
if (!new_crtc_state->bigjoiner_slave) {
intel_crtc_copy_uapi_to_hw_state(state, new_crtc_state);
@@ -15640,6 +15638,16 @@ static int intel_atomic_check(struct drm_device *dev,
new_crtc_state->update_pipe = false;
}
}
+
+ if (new_crtc_state->bigjoiner) {
+ struct intel_crtc_state *linked_crtc_state =
+ intel_atomic_get_new_crtc_state(state, new_crtc_state->bigjoiner_linked_crtc);
+
+ if (needs_modeset(linked_crtc_state)) {
+ new_crtc_state->uapi.mode_changed = true;
+ new_crtc_state->update_pipe = false;
+ }
+ }
}
for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
--
2.26.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Properly flag modesets for all bigjoiner pipes
2020-11-20 16:01 [Intel-gfx] [PATCH] drm/i915: Properly flag modesets for all bigjoiner pipes Ville Syrjala
@ 2020-11-20 17:52 ` Patchwork
2020-11-20 18:23 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-11-20 17:52 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Properly flag modesets for all bigjoiner pipes
URL : https://patchwork.freedesktop.org/series/84118/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
2bed74690121 drm/i915: Properly flag modesets for all bigjoiner pipes
-:90: WARNING:LONG_LINE: line length of 110 exceeds 100 columns
#90: FILE: drivers/gpu/drm/i915/display/intel_display.c:15644:
+ intel_atomic_get_new_crtc_state(state, new_crtc_state->bigjoiner_linked_crtc);
total: 0 errors, 1 warnings, 0 checks, 77 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Properly flag modesets for all bigjoiner pipes
2020-11-20 16:01 [Intel-gfx] [PATCH] drm/i915: Properly flag modesets for all bigjoiner pipes Ville Syrjala
2020-11-20 17:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2020-11-20 18:23 ` Patchwork
2020-11-20 22:23 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-11-20 22:55 ` [Intel-gfx] [PATCH] " Navare, Manasi
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-11-20 18:23 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 5607 bytes --]
== Series Details ==
Series: drm/i915: Properly flag modesets for all bigjoiner pipes
URL : https://patchwork.freedesktop.org/series/84118/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9373 -> Patchwork_18952
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18952:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@runner@aborted:
- {fi-dg1-1}: [FAIL][1] ([i915#2292] / [k.org#204565]) -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-dg1-1/igt@runner@aborted.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-dg1-1/igt@runner@aborted.html
New tests
---------
New tests have been introduced between CI_DRM_9373 and Patchwork_18952:
### New CI tests (1) ###
* boot:
- Statuses : 41 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_18952 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_hotunplug@unbind-rebind:
- fi-blb-e6850: [PASS][3] -> [INCOMPLETE][4] ([i915#2540])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-blb-e6850/igt@core_hotunplug@unbind-rebind.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-blb-e6850/igt@core_hotunplug@unbind-rebind.html
* igt@i915_module_load@reload:
- fi-tgl-u2: [PASS][5] -> [DMESG-WARN][6] ([i915#1982] / [k.org#205379])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-tgl-u2/igt@i915_module_load@reload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-tgl-u2/igt@i915_module_load@reload.html
* igt@i915_pm_rpm@module-reload:
- fi-bsw-kefka: [PASS][7] -> [DMESG-WARN][8] ([i915#1982]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-bsw-kefka/igt@i915_pm_rpm@module-reload.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-bsw-kefka/igt@i915_pm_rpm@module-reload.html
* igt@kms_busy@basic@flip:
- fi-kbl-soraka: [PASS][9] -> [DMESG-WARN][10] ([i915#1982])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-kbl-soraka/igt@kms_busy@basic@flip.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-kbl-soraka/igt@kms_busy@basic@flip.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-icl-u2: [PASS][11] -> [DMESG-WARN][12] ([i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
#### Possible fixes ####
* igt@core_hotunplug@unbind-rebind:
- fi-skl-lmem: [DMESG-WARN][13] ([i915#2605]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-skl-lmem/igt@core_hotunplug@unbind-rebind.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-skl-lmem/igt@core_hotunplug@unbind-rebind.html
* igt@i915_module_load@reload:
- fi-bsw-kefka: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16] +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-bsw-kefka/igt@i915_module_load@reload.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-bsw-kefka/igt@i915_module_load@reload.html
* igt@i915_selftest@live@execlists:
- fi-kbl-guc: [INCOMPLETE][17] ([i915#1037] / [i915#794]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/fi-kbl-guc/igt@i915_selftest@live@execlists.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/fi-kbl-guc/igt@i915_selftest@live@execlists.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1037]: https://gitlab.freedesktop.org/drm/intel/issues/1037
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2292]: https://gitlab.freedesktop.org/drm/intel/issues/2292
[i915#2540]: https://gitlab.freedesktop.org/drm/intel/issues/2540
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794
[k.org#204565]: https://bugzilla.kernel.org/show_bug.cgi?id=204565
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (45 -> 41)
------------------------------
Additional (1): fi-tgl-y
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9373 -> Patchwork_18952
CI-20190529: 20190529
CI_DRM_9373: 9cdf0261b50968252f7775f0de5d34ab8f8b4892 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5864: afc0e559615b791d229ba977f792d04de13a37f7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18952: 2bed746901215cc00701a79bd667dab8da3122b6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2bed74690121 drm/i915: Properly flag modesets for all bigjoiner pipes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/index.html
[-- Attachment #1.2: Type: text/html, Size: 6731 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Properly flag modesets for all bigjoiner pipes
2020-11-20 16:01 [Intel-gfx] [PATCH] drm/i915: Properly flag modesets for all bigjoiner pipes Ville Syrjala
2020-11-20 17:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-11-20 18:23 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2020-11-20 22:23 ` Patchwork
2020-11-20 22:55 ` [Intel-gfx] [PATCH] " Navare, Manasi
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2020-11-20 22:23 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 15912 bytes --]
== Series Details ==
Series: drm/i915: Properly flag modesets for all bigjoiner pipes
URL : https://patchwork.freedesktop.org/series/84118/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9373_full -> Patchwork_18952_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
New tests
---------
New tests have been introduced between CI_DRM_9373_full and Patchwork_18952_full:
### New CI tests (1) ###
* boot:
- Statuses : 199 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_18952_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [PASS][1] -> [DMESG-WARN][2] ([i915#118] / [i915#95]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-glk8/igt@gem_exec_whisper@basic-queues-forked-all.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-glk3/igt@gem_exec_whisper@basic-queues-forked-all.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-hsw: [PASS][3] -> [WARN][4] ([i915#1519])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-hsw1/igt@i915_pm_rc6_residency@rc6-fence.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-hsw1/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@kms_cursor_crc@pipe-c-cursor-64x21-random:
- shard-skl: [PASS][5] -> [FAIL][6] ([i915#54])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl6/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl1/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
* igt@kms_cursor_edge_walk@pipe-b-256x256-top-edge:
- shard-hsw: [PASS][7] -> [DMESG-WARN][8] ([i915#1982])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-hsw6/igt@kms_cursor_edge_walk@pipe-b-256x256-top-edge.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-hsw6/igt@kms_cursor_edge_walk@pipe-b-256x256-top-edge.html
* igt@kms_dp_aux_dev:
- shard-iclb: [PASS][9] -> [DMESG-WARN][10] ([i915#262])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-iclb4/igt@kms_dp_aux_dev.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-iclb7/igt@kms_dp_aux_dev.html
* igt@kms_flip@basic-plain-flip@a-dp1:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#1635] / [i915#1982]) +7 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-apl1/igt@kms_flip@basic-plain-flip@a-dp1.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-apl6/igt@kms_flip@basic-plain-flip@a-dp1.html
* igt@kms_flip@dpms-vs-vblank-race-interruptible@a-dp1:
- shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#1982]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-kbl4/igt@kms_flip@dpms-vs-vblank-race-interruptible@a-dp1.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-kbl6/igt@kms_flip@dpms-vs-vblank-race-interruptible@a-dp1.html
* igt@kms_flip@flip-vs-expired-vblank@c-edp1:
- shard-skl: [PASS][15] -> [DMESG-FAIL][16] ([i915#1982])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl3/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl6/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html
* igt@kms_flip@flip-vs-suspend@b-dp1:
- shard-kbl: [PASS][17] -> [DMESG-WARN][18] ([i915#180])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-kbl3/igt@kms_flip@flip-vs-suspend@b-dp1.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-kbl7/igt@kms_flip@flip-vs-suspend@b-dp1.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-gtt:
- shard-glk: [PASS][19] -> [DMESG-WARN][20] ([i915#1982])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-glk6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-gtt.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-glk6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-tglb: [PASS][21] -> [DMESG-WARN][22] ([i915#1982]) +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-tglb8/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt.html
* igt@kms_plane_cursor@pipe-a-viewport-size-128:
- shard-skl: [PASS][23] -> [DMESG-WARN][24] ([i915#1982]) +6 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl1/igt@kms_plane_cursor@pipe-a-viewport-size-128.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl9/igt@kms_plane_cursor@pipe-a-viewport-size-128.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-iclb1/igt@kms_psr@psr2_sprite_plane_move.html
* igt@perf_pmu@module-unload:
- shard-iclb: [PASS][27] -> [DMESG-WARN][28] ([i915#1982] / [i915#262])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-iclb3/igt@perf_pmu@module-unload.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-iclb8/igt@perf_pmu@module-unload.html
* igt@prime_vgem@sync@rcs0:
- shard-tglb: [PASS][29] -> [INCOMPLETE][30] ([i915#409])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-tglb8/igt@prime_vgem@sync@rcs0.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-tglb7/igt@prime_vgem@sync@rcs0.html
#### Possible fixes ####
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][31] ([i915#2190]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-tglb6/igt@gem_huc_copy@huc-copy.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-tglb1/igt@gem_huc_copy@huc-copy.html
* igt@i915_module_load@reload:
- shard-skl: [DMESG-WARN][33] ([i915#1982]) -> [PASS][34] +5 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl3/igt@i915_module_load@reload.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl6/igt@i915_module_load@reload.html
* {igt@kms_async_flips@test-time-stamp}:
- shard-tglb: [FAIL][35] ([i915#2597]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-tglb7/igt@kms_async_flips@test-time-stamp.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-tglb7/igt@kms_async_flips@test-time-stamp.html
* igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen:
- shard-skl: [FAIL][37] ([i915#54]) -> [PASS][38] +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl8/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl3/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
* igt@kms_cursor_edge_walk@pipe-b-256x256-top-edge:
- shard-apl: [DMESG-WARN][39] ([i915#1635] / [i915#1982]) -> [PASS][40] +3 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-apl7/igt@kms_cursor_edge_walk@pipe-b-256x256-top-edge.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-apl7/igt@kms_cursor_edge_walk@pipe-b-256x256-top-edge.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [FAIL][41] ([i915#2346]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled:
- shard-glk: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44] +3 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-glk1/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-glk2/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled.html
* igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1:
- shard-skl: [FAIL][45] ([i915#2122]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl2/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl7/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html
* igt@kms_frontbuffer_tracking@fbcpsr-suspend:
- shard-iclb: [INCOMPLETE][47] ([i915#1185] / [i915#123]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-suspend.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][49] ([i915#1188]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl10/igt@kms_hdr@bpc-switch-dpms.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl7/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][51] ([fdo#109441]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_vblank@crtc-id:
- shard-kbl: [DMESG-WARN][53] ([i915#1982]) -> [PASS][54] +4 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-kbl6/igt@kms_vblank@crtc-id.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-kbl1/igt@kms_vblank@crtc-id.html
* igt@kms_vblank@pipe-c-query-busy:
- shard-hsw: [DMESG-WARN][55] ([i915#1982]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-hsw6/igt@kms_vblank@pipe-c-query-busy.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-hsw4/igt@kms_vblank@pipe-c-query-busy.html
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][57] ([i915#198] / [i915#2405]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl4/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl3/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][59] ([i915#588]) -> [SKIP][60] ([i915#658])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-iclb2/igt@i915_pm_dc@dc3co-vpb-simulation.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-iclb8/igt@i915_pm_dc@dc3co-vpb-simulation.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic:
- shard-skl: [DMESG-WARN][61] ([i915#1982]) -> [DMESG-FAIL][62] ([i915#1982]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html
* igt@runner@aborted:
- shard-iclb: [FAIL][63] ([i915#2295]) -> [FAIL][64] ([i915#2295] / [i915#483])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-iclb4/igt@runner@aborted.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-iclb7/igt@runner@aborted.html
- shard-tglb: [FAIL][65] ([i915#2295]) -> ([FAIL][66], [FAIL][67]) ([i915#2295] / [i915#2426] / [i915#409])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-tglb8/igt@runner@aborted.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-tglb6/igt@runner@aborted.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-tglb7/igt@runner@aborted.html
- shard-skl: [FAIL][68] ([i915#2295]) -> ([FAIL][69], [FAIL][70]) ([i915#2029] / [i915#2295])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9373/shard-skl1/igt@runner@aborted.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl3/igt@runner@aborted.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18952/shard-skl4/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1185]: https://gitlab.freedesktop.org/drm/intel/issues/1185
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#123]: https://gitlab.freedesktop.org/drm/intel/issues/123
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[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#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2405]: https://gitlab.freedesktop.org/drm/intel/issues/2405
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#409]: https://gitlab.freedesktop.org/drm/intel/issues/409
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9373 -> Patchwork_18952
CI-20190529: 20190529
CI_DRM_9373: 9cdf0261b50968252f7775f0de5d34ab8f8b4892 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5864: afc0e559615b791d229ba977f792d04de13a37f7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18952: 2bed746901215cc00701a79bd667dab8da3122b6 @ 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_18952/index.html
[-- Attachment #1.2: Type: text/html, Size: 18962 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Properly flag modesets for all bigjoiner pipes
2020-11-20 16:01 [Intel-gfx] [PATCH] drm/i915: Properly flag modesets for all bigjoiner pipes Ville Syrjala
` (2 preceding siblings ...)
2020-11-20 22:23 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2020-11-20 22:55 ` Navare, Manasi
3 siblings, 0 replies; 5+ messages in thread
From: Navare, Manasi @ 2020-11-20 22:55 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
On Fri, Nov 20, 2020 at 06:01:35PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> If either of the bigjoiner pipes needs a modeset then we need
> a modeset on both pipes. Make it so.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 40 ++++++++++++--------
> 1 file changed, 24 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 595183f7b60f..321321230a55 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -15355,21 +15355,16 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
> return -EINVAL;
> }
>
> -static int kill_bigjoiner_slave(struct intel_atomic_state *state,
> - struct intel_crtc_state *master_crtc_state)
> +static void kill_bigjoiner_slave(struct intel_atomic_state *state,
> + struct intel_crtc_state *master_crtc_state)
> {
> struct intel_crtc_state *slave_crtc_state =
> - intel_atomic_get_crtc_state(&state->base,
> - master_crtc_state->bigjoiner_linked_crtc);
> -
> - if (IS_ERR(slave_crtc_state))
> - return PTR_ERR(slave_crtc_state);
> + intel_atomic_get_new_crtc_state(state, master_crtc_state->bigjoiner_linked_crtc);
Isnt this just a cleanup, doesnt relate to adding linked bigjoiner
pipe to the modeset.
Split this in a separate patch? Or atleast mention this in the commit message
Other than that looks good to me
Manasi
>
> slave_crtc_state->bigjoiner = master_crtc_state->bigjoiner = false;
> slave_crtc_state->bigjoiner_slave = master_crtc_state->bigjoiner_slave = false;
> slave_crtc_state->bigjoiner_linked_crtc = master_crtc_state->bigjoiner_linked_crtc = NULL;
> intel_crtc_copy_uapi_to_hw_state(state, slave_crtc_state);
> - return 0;
> }
>
> /**
> @@ -15507,7 +15502,7 @@ static int intel_atomic_check_async(struct intel_atomic_state *state)
>
> static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
> {
> - const struct intel_crtc_state *crtc_state;
> + struct intel_crtc_state *crtc_state;
> struct intel_crtc *crtc;
> int i;
>
> @@ -15521,6 +15516,16 @@ static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
> crtc_state->bigjoiner_linked_crtc);
> if (IS_ERR(linked_crtc_state))
> return PTR_ERR(linked_crtc_state);
> +
> + if (needs_modeset(crtc_state))
> + linked_crtc_state->uapi.mode_changed = true;
> + }
> +
> + for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
> + /* Kill old bigjoiner link, we may re-establish afterwards */
> + if (needs_modeset(crtc_state) &&
> + crtc_state->bigjoiner && !crtc_state->bigjoiner_slave)
> + kill_bigjoiner_slave(state, crtc_state);
> }
>
> return 0;
> @@ -15564,13 +15569,6 @@ static int intel_atomic_check(struct drm_device *dev,
> continue;
> }
>
> - /* Kill old bigjoiner link, we may re-establish afterwards */
> - if (old_crtc_state->bigjoiner && !old_crtc_state->bigjoiner_slave) {
> - ret = kill_bigjoiner_slave(state, new_crtc_state);
> - if (ret)
> - goto fail;
> - }
> -
> if (!new_crtc_state->uapi.enable) {
> if (!new_crtc_state->bigjoiner_slave) {
> intel_crtc_copy_uapi_to_hw_state(state, new_crtc_state);
> @@ -15640,6 +15638,16 @@ static int intel_atomic_check(struct drm_device *dev,
> new_crtc_state->update_pipe = false;
> }
> }
> +
> + if (new_crtc_state->bigjoiner) {
> + struct intel_crtc_state *linked_crtc_state =
> + intel_atomic_get_new_crtc_state(state, new_crtc_state->bigjoiner_linked_crtc);
> +
> + if (needs_modeset(linked_crtc_state)) {
> + new_crtc_state->uapi.mode_changed = true;
> + new_crtc_state->update_pipe = false;
> + }
> + }
> }
>
> for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
> --
> 2.26.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-20 22:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-20 16:01 [Intel-gfx] [PATCH] drm/i915: Properly flag modesets for all bigjoiner pipes Ville Syrjala
2020-11-20 17:52 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-11-20 18:23 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-20 22:23 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-11-20 22:55 ` [Intel-gfx] [PATCH] " Navare, Manasi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.