drm/i915: Remove the old global state stuff
Subsystems (3)
PATCH 1/1 drm/i915: Remove the old global state stuff
From: Ville Syrjälä <[email protected]>
With the dbuf code mostly converted over to the new global state handling we can remove the leftovers of the old global state stuff.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 39 ------------------- drivers/gpu/drm/i915/display/intel_atomic.h | 4 -- drivers/gpu/drm/i915/display/intel_display.c | 22 ----------- .../drm/i915/display/intel_display_types.h | 7 ---- 4 files changed, 72 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +0 -39
@@ -527,8 +527,6 @@ void intel_atomic_state_clear(struct drm_atomic_state *s)intel_atomic_clear_global_state (state); state->dpll_set = state->modeset = false; - state->global_state_changed = false; - state->active_pipes =0 ; } struct intel_crtc_state *
@@ -542,40 +540,3 @@ intel_atomic_get_crtc_state(struct drm_atomic_state *state,return to_intel_crtc_state (crtc_state); } - -int _intel_atomic_lock_global_state (struct intel_atomic_state *state) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -struct intel_crtc *crtc; - - state->global_state_changed = true; - -for_each_intel_crtc (&dev_priv->drm, crtc) { -int ret; - - ret =drm_modeset_lock (&crtc->base.mutex, - state->base.acquire_ctx); -if (ret) -return ret; - } - -return 0 ; -} - -int _intel_atomic_serialize_global_state (struct intel_atomic_state *state) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -struct intel_crtc *crtc; - - state->global_state_changed = true; - -for_each_intel_crtc (&dev_priv->drm, crtc) { -struct intel_crtc_state *crtc_state; - - crtc_state =intel_atomic_get_crtc_state (&state->base, crtc); -if (IS_ERR (crtc_state)) -return PTR_ERR (crtc_state); - } - -return 0 ; -}
drivers/gpu/drm/i915/display/intel_atomic.h +0 -4
@@ -56,8 +56,4 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state); -int _intel_atomic_lock_global_state (struct intel_atomic_state *state); - -int _intel_atomic_serialize_global_state (struct intel_atomic_state *state); -#endif /* __INTEL_ATOMIC_H__ */
drivers/gpu/drm/i915/display/intel_display.c +0 -22
@@ -14636,16 +14636,8 @@ u8 intel_calc_active_pipes(struct intel_atomic_state *state,static int intel_modeset_checks (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -int ret; state->modeset = true; - state->active_pipes =intel_calc_active_pipes (state, dev_priv->active_pipes); - -if (state->active_pipes != dev_priv->active_pipes) { - ret =_intel_atomic_lock_global_state (state); -if (ret) -return ret; - }if (IS_HASWELL (dev_priv))return hsw_mode_set_planes_workaround (state);
@@ -15759,14 +15751,6 @@ static void intel_atomic_track_fbs(struct intel_atomic_state *state) plane->frontbuffer_bit); } -static void assert_global_state_locked (struct drm_i915_private *dev_priv) -{ -struct intel_crtc *crtc; - -for_each_intel_crtc (&dev_priv->drm, crtc) -drm_modeset_lock_assert_held (&crtc->base.mutex); -} -static int intel_atomic_commit (struct drm_device *dev,struct drm_atomic_state *_state,bool nonblock)
@@ -15842,12 +15826,6 @@ static int intel_atomic_commit(struct drm_device *dev,intel_shared_dpll_swap_state (state);intel_atomic_track_fbs (state); -if (state->global_state_changed) { -assert_global_state_locked (dev_priv); - - dev_priv->active_pipes = state->active_pipes; - } -drm_atomic_state_get (&state->base);INIT_WORK (&state->base.commit_work, intel_atomic_commit_work);
drivers/gpu/drm/i915/display/intel_display_types.h +0 -7
@@ -481,8 +481,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -u8 active_pipes; -struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];/*
@@ -493,11 +491,6 @@ struct intel_atomic_state {bool rps_interactive; -/* -* active_pipes -*/ -bool global_state_changed; -struct i915_sw_fence commit_ready;struct llist_node freed;
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Remove the old global state stuff
== Series Details ==
== Series Details ==
Series: drm/i915: Remove the old global state stuff
URL : https://patchwork.freedesktop.org/series/81265/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8954 -> Patchwork_18434
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18434 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18434, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18434:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_gttfill@basic:
- fi-cfl-8109u: [PASS][1] -> [TIMEOUT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-cfl-8109u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-cfl-8109u/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18434 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parallel@engines@basic:
- fi-tgl-u2: [PASS][3] -> [INCOMPLETE][4] ([i915#2398])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-tgl-u2/igt@gem_exec_parallel@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-tgl-u2/igt@gem_exec_parallel@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-byt-j1900: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-byt-j1900/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-byt-j1900/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-icl-y: [PASS][7] -> [INCOMPLETE][8] ([i915#2276])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-icl-y/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-icl-y/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-n3050: [PASS][9] -> [DMESG-WARN][10] ([i915#1982])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-bsw-n3050/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-bsw-n3050/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][11] -> [DMESG-WARN][12] ([i915#1982]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-icl-u2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_parallel@engines@contexts:
- fi-icl-y: [INCOMPLETE][13] ([i915#2398]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-icl-y/igt@gem_exec_parallel@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-icl-y/igt@gem_exec_parallel@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-bsw-kefka/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-bsw-kefka/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-bsw-n3050: [DMESG-WARN][17] ([i915#1982]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-bsw-n3050/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-bsw-n3050/igt@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1:
- fi-icl-u2: [DMESG-WARN][19] ([i915#1982]) -> [PASS][20] +2 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-icl-u2/igt@kms_flip@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-icl-u2/igt@kms_flip@[email protected]
#### Warnings ####
* igt@amdgpu/amd_prime@i915-to-amd:
- fi-cfl-8109u: [FAIL][21] -> [SKIP][22] ([fdo#109271])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8954/fi-cfl-8109u/igt@amdgpu/[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/fi-cfl-8109u/igt@amdgpu/[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#2398]: https://gitlab.freedesktop.org/drm/intel/issues/2398
Participating hosts (38 -> 33)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_8954 -> Patchwork_18434
CI-20190529: 20190529
CI_DRM_8954: 3d79444abaf4a8a0036a944c0cfd308a8b844ced @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5776: 46e4315096bcaa2465c82c547274627365b1a69e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18434: 11bee1b6fedfe1dbc316df5f928430bebb0b49bb @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
11bee1b6fedf drm/i915: Remove the old global state stuff
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18434/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Remove the old global state stuff (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Remove the old global state stuff (rev2)
URL : https://patchwork.freedesktop.org/series/81265/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8995 -> Patchwork_18478
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/index.html
Known issues
------------
Here are the changes found in Patchwork_18478 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_flink_basic@flink-lifetime:
- fi-tgl-y: [PASS][1] -> [DMESG-WARN][2] ([i915#402]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-tgl-y/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-tgl-y/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-icl-y: [PASS][3] -> [INCOMPLETE][4] ([i915#2276])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-icl-y/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-icl-y/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@objects:
- fi-apl-guc: [PASS][5] -> [INCOMPLETE][6] ([i915#1635] / [i915#337])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-apl-guc/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-apl-guc/igt@i915_selftest@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-edp1:
- fi-icl-u2: [PASS][7] -> [DMESG-WARN][8] ([i915#1982])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-icl-u2/igt@kms_flip@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-icl-u2/igt@kms_flip@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-a:
- fi-tgl-y: [PASS][9] -> [DMESG-WARN][10] ([i915#1982]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-tgl-y/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- {fi-kbl-7560u}: [INCOMPLETE][11] ([i915#2417]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-kbl-7560u/igt@debugfs_test@read_all_entries.html
* igt@gem_flink_basic@bad-flink:
- fi-tgl-y: [DMESG-WARN][13] ([i915#402]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-tgl-y/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-tgl-y/igt@[email protected]
* igt@i915_module_load@reload:
- fi-bxt-dsi: [DMESG-WARN][15] ([i915#1635] / [i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-bxt-dsi/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-bxt-dsi/igt@[email protected]
* igt@kms_busy@basic@flip:
- fi-kbl-x1275: [DMESG-WARN][17] ([i915#62] / [i915#92] / [i915#95]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-kbl-x1275/igt@kms_busy@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-kbl-x1275/igt@kms_busy@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-icl-u2: [DMESG-WARN][19] ([i915#1982]) -> [PASS][20] +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-icl-u2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-icl-u2/igt@[email protected]
- fi-bsw-kefka: [DMESG-WARN][21] ([i915#1982]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-bsw-kefka/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-bsw-kefka/igt@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2:
- fi-skl-guc: [DMESG-WARN][23] ([i915#2203]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-skl-guc/igt@kms_flip@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-skl-guc/igt@kms_flip@[email protected]
* igt@kms_force_connector_basic@force-connector-state:
- fi-tgl-y: [DMESG-WARN][25] ([i915#1982]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-tgl-y/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@kms_flip@basic-flip-vs-dpms@a-dp1:
- fi-kbl-x1275: [DMESG-WARN][27] ([i915#62] / [i915#92]) -> [DMESG-WARN][28] ([i915#62] / [i915#92] / [i915#95]) +2 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-kbl-x1275/igt@kms_flip@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-kbl-x1275/igt@kms_flip@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- fi-kbl-x1275: [DMESG-WARN][29] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][30] ([i915#62] / [i915#92])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/fi-kbl-x1275/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/fi-kbl-x1275/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#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2417]: https://gitlab.freedesktop.org/drm/intel/issues/2417
[i915#337]: https://gitlab.freedesktop.org/drm/intel/issues/337
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (44 -> 39)
------------------------------
Missing (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_8995 -> Patchwork_18478
CI-20190529: 20190529
CI_DRM_8995: 42b001bdd89c350f154145c196931bdfa86bc13c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5780: 9c5dfeb0338d7f98ad998663a595eab71ea887f3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18478: ff5af0768440a212b2d2d19a4b53417f4a5a369b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ff5af0768440 drm/i915: Remove the old global state stuff
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Remove the old global state stuff (rev2)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Remove the old global state stuff (rev2)
URL : https://patchwork.freedesktop.org/series/81265/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8995_full -> Patchwork_18478_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_18478_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@legacy-engines-mixed-process@render:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2374])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-glk5/igt@gem_ctx_persistence@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-glk4/igt@gem_ctx_persistence@[email protected]
* igt@gem_exec_whisper@basic-queues-priority:
- shard-glk: [PASS][3] -> [DMESG-WARN][4] ([i915#118] / [i915#95])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-glk2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-glk3/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-varying-size:
- shard-tglb: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-tglb5/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-tglb5/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [PASS][7] -> [FAIL][8] ([i915#2346])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl8/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl3/igt@[email protected]
* igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([i915#1635] / [i915#1982])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-apl2/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-apl3/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
- shard-glk: [PASS][11] -> [DMESG-WARN][12] ([i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-glk5/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-glk4/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
* igt@kms_draw_crc@draw-method-xrgb8888-render-ytiled:
- shard-skl: [PASS][13] -> [DMESG-WARN][14] ([i915#1982]) +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl10/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-hdmi-a1:
- shard-glk: [PASS][15] -> [FAIL][16] ([i915#2122])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-glk5/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-glk1/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@b-vga1:
- shard-snb: [PASS][17] -> [DMESG-WARN][18] ([i915#42])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-snb6/igt@kms_flip@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-snb6/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
- shard-skl: [PASS][19] -> [FAIL][20] ([i915#2122])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl8/igt@kms_flip@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl7/igt@kms_flip@[email protected]
* igt@kms_flip_tiling@flip-to-x-tiled:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#167])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl8/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-pgflip-blt:
- shard-iclb: [PASS][23] -> [DMESG-WARN][24] ([i915#1982])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-iclb4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-iclb8/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [PASS][25] -> [DMESG-WARN][26] ([i915#180]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-kbl6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-kbl4/igt@[email protected]
* igt@kms_plane_lowres@pipe-b-tiling-x:
- shard-iclb: [PASS][27] -> [FAIL][28] ([i915#899])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-iclb5/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-iclb7/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_gtt:
- shard-iclb: [PASS][29] -> [SKIP][30] ([fdo#109441])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_gtt.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-iclb6/igt@kms_psr@psr2_cursor_mmap_gtt.html
#### Possible fixes ####
* igt@gem_ctx_persistence@legacy-engines-mixed-process@render:
- shard-skl: [FAIL][31] ([i915#2374]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl10/igt@gem_ctx_persistence@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl8/igt@gem_ctx_persistence@[email protected]
* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [FAIL][33] ([i915#2389]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-glk7/igt@gem_exec_reloc@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-glk7/igt@gem_exec_reloc@[email protected]
* igt@gem_exec_schedule@out-order@vecs0:
- shard-skl: [DMESG-WARN][35] ([i915#1982]) -> [PASS][36] +4 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl7/igt@gem_exec_schedule@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl4/igt@gem_exec_schedule@[email protected]
* igt@gem_userptr_blits@unsync-unmap-cycles:
- shard-skl: [TIMEOUT][37] ([i915#1958]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl8/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl7/igt@[email protected]
* igt@i915_selftest@live@gem_contexts:
- shard-skl: [INCOMPLETE][39] -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl3/igt@i915_selftest@live@gem_contexts.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl2/igt@i915_selftest@live@gem_contexts.html
* igt@kms_cursor_edge_walk@pipe-b-128x128-left-edge:
- shard-glk: [DMESG-WARN][41] ([i915#1982]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-glk2/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-glk3/igt@[email protected]
* igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions:
- shard-tglb: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-tglb2/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-tglb6/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [FAIL][45] ([i915#79]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl6/igt@kms_flip@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl9/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][47] ([i915#180]) -> [PASS][48] +4 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-kbl3/igt@kms_flip@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-kbl6/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@c-edp1:
- shard-skl: [INCOMPLETE][49] ([i915#198]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl2/igt@kms_flip@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl7/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-fb-recreate@b-hdmi-a2:
- shard-glk: [FAIL][51] ([i915#2122]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-glk8/igt@kms_flip@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-glk9/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-ts-check-interruptible@b-edp1:
- shard-skl: [FAIL][53] ([i915#2122]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl10/igt@kms_flip@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl8/igt@kms_flip@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][55] ([i915#1188]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl1/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl5/igt@[email protected]
* igt@kms_panel_fitting@atomic-fastset:
- shard-iclb: [FAIL][57] ([i915#83]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-iclb6/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-iclb2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][59] ([fdo#108145] / [i915#265]) -> [PASS][60] +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl10/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl8/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][61] ([fdo#109441]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-iclb5/igt@kms_psr@psr2_sprite_plane_move.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vblank@pipe-c-query-busy:
- shard-apl: [DMESG-WARN][63] ([i915#1635] / [i915#1982]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-apl4/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-apl2/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-skl: [FAIL][65] ([i915#1542]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-skl7/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-skl10/igt@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][67] ([i915#588]) -> [SKIP][68] ([i915#658])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-iclb2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-iclb4/igt@[email protected]
* igt@kms_content_protection@atomic:
- shard-apl: [TIMEOUT][69] ([i915#1319] / [i915#1635]) -> [TIMEOUT][70] ([i915#1319] / [i915#1635] / [i915#1958])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8995/shard-apl1/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18478/shard-apl1/igt@[email protected]
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#167]: https://gitlab.freedesktop.org/drm/intel/issues/167
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2374]: https://gitlab.freedesktop.org/drm/intel/issues/2374
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#42]: https://gitlab.freedesktop.org/drm/intel/issues/42
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#83]: https://gitlab.freedesktop.org/drm/intel/issues/83
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (12 -> 11)
------------------------------
Missing (1): pig-snb-2600
Build changes
-------------
* Linux: CI_DRM_8995 -> Patchwork_18478
CI-20190529: 20190529
CI_DRM_8995: 42b001bdd89c350f154145c196931bdfa86bc13c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5780: 9c5dfeb0338d7f98ad998663a595eab71ea887f3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18478: ff5af0768440a212b2d2d19a4b53417f4a5a369b @ 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_18478/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
With the dbuf code mostly converted over to the new global state handling we can remove the leftovers of the old global state stuff.
Quoted 7 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 39 ------------------- drivers/gpu/drm/i915/display/intel_atomic.h | 4 -- drivers/gpu/drm/i915/display/intel_display.c | 22 ----------- .../drm/i915/display/intel_display_types.h | 7 ---- 4 files changed, 72 deletions(-)
Quoted 149 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-39@@ -527,8 +527,6 @@ void intel_atomic_state_clear(struct drm_atomic_state *s)intel_atomic_clear_global_state (state); state->dpll_set = state->modeset = false; - state->global_state_changed = false; - state->active_pipes =0 ; } struct intel_crtc_state *@@ -542,40 +540,3 @@ intel_atomic_get_crtc_state(struct drm_atomic_state *state,return to_intel_crtc_state (crtc_state); } - -int _intel_atomic_lock_global_state (struct intel_atomic_state *state) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -struct intel_crtc *crtc; - - state->global_state_changed = true; - -for_each_intel_crtc (&dev_priv->drm, crtc) { -int ret; - - ret =drm_modeset_lock (&crtc->base.mutex, - state->base.acquire_ctx); -if (ret) -return ret; - } - -return 0 ; -} - -int _intel_atomic_serialize_global_state (struct intel_atomic_state *state) -{ -struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -struct intel_crtc *crtc; - - state->global_state_changed = true; - -for_each_intel_crtc (&dev_priv->drm, crtc) { -struct intel_crtc_state *crtc_state; - - crtc_state =intel_atomic_get_crtc_state (&state->base, crtc); -if (IS_ERR (crtc_state)) -return PTR_ERR (crtc_state); - } - -return 0 ; -}drivers/gpu/drm/i915/display/intel_atomic.h +0
-4@@ -56,8 +56,4 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state); -int _intel_atomic_lock_global_state (struct intel_atomic_state *state); - -int _intel_atomic_serialize_global_state (struct intel_atomic_state *state); -#endif /* __INTEL_ATOMIC_H__ */ drivers/gpu/drm/i915/display/intel_display.c +0
-22@@ -14636,16 +14636,8 @@ u8 intel_calc_active_pipes(struct intel_atomic_state *state,static int intel_modeset_checks (struct intel_atomic_state *state) {struct drm_i915_private *dev_priv =to_i915 (state->base.dev); -int ret; state->modeset = true; - state->active_pipes =intel_calc_active_pipes (state, dev_priv->active_pipes); - -if (state->active_pipes != dev_priv->active_pipes) { - ret =_intel_atomic_lock_global_state (state); -if (ret) -return ret; - }if (IS_HASWELL (dev_priv))return hsw_mode_set_planes_workaround (state);@@ -15759,14 +15751,6 @@ static void intel_atomic_track_fbs(struct intel_atomic_state *state) plane->frontbuffer_bit); } -static void assert_global_state_locked (struct drm_i915_private *dev_priv) -{ -struct intel_crtc *crtc; - -for_each_intel_crtc (&dev_priv->drm, crtc) -drm_modeset_lock_assert_held (&crtc->base.mutex); -} -static int intel_atomic_commit (struct drm_device *dev,struct drm_atomic_state *_state,bool nonblock)@@ -15842,12 +15826,6 @@ static int intel_atomic_commit(struct drm_device *dev,intel_shared_dpll_swap_state (state);intel_atomic_track_fbs (state); -if (state->global_state_changed) { -assert_global_state_locked (dev_priv); - - dev_priv->active_pipes = state->active_pipes; - } -drm_atomic_state_get (&state->base);INIT_WORK (&state->base.commit_work, intel_atomic_commit_work);drivers/gpu/drm/i915/display/intel_display_types.h +0
-7@@ -481,8 +481,6 @@ struct intel_atomic_state {bool dpll_set, modeset; -u8 active_pipes; -struct intel_shared_dpll_state shared_dpll[I915_NUM_PLLS ];/* @@ -493,11 +491,6 @@ struct intel_atomic_state {bool rps_interactive; -/* -* active_pipes -*/ -bool global_state_changed; -struct i915_sw_fence commit_ready;struct llist_node freed;Signature · 6 lines
2.26.2 _______________________________________________ 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