drm/i915: Clear the shared PLL from the put_dplls() hook
Subsystems (3)
PATCH 1/2 drm/i915: Clear the shared PLL from the put_dplls() hook
For symmetry with the get_dplls() hook which sets the shared_dpll pointer clear the same pointer from the put_dplls() hook.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 -- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -2
@@ -13285,8 +13285,6 @@ static void intel_modeset_clear_plls(struct intel_atomic_state *state)if (!needs_modeset (new_crtc_state))continue ; - new_crtc_state->shared_dpll =NULL ; -intel_release_shared_dplls (state, crtc); } }
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +13 -5
@@ -323,13 +323,17 @@ static void intel_unreference_shared_dpll(struct intel_atomic_state *state,static void intel_put_dpll (struct intel_atomic_state *state,struct intel_crtc *crtc) { -struct intel_crtc_state *crtc_state = +struct intel_crtc_state *old_crtc_state =intel_atomic_get_old_crtc_state (state, crtc); +struct intel_crtc_state *new_crtc_state = +intel_atomic_get_new_crtc_state (state, crtc); + + new_crtc_state->shared_dpll =NULL ; -if (!crtc_state->shared_dpll) +if (!old_crtc_state->shared_dpll)return ; -intel_unreference_shared_dpll (state, crtc, crtc_state->shared_dpll); +intel_unreference_shared_dpll (state, crtc, old_crtc_state->shared_dpll); }/**
@@ -3008,13 +3012,17 @@ static bool icl_get_dplls(struct intel_atomic_state *state,static void icl_put_dplls (struct intel_atomic_state *state,struct intel_crtc *crtc) { -struct intel_crtc_state *crtc_state = +struct intel_crtc_state *old_crtc_state =intel_atomic_get_old_crtc_state (state, crtc); +struct intel_crtc_state *new_crtc_state = +intel_atomic_get_new_crtc_state (state, crtc);enum icl_port_dpll_id id; + new_crtc_state->shared_dpll =NULL ; +for (id =ICL_PORT_DPLL_DEFAULT ; id <ICL_PORT_DPLL_COUNT ; id++) {struct icl_port_dpll *port_dpll = - &crtc_state->icl_port_dplls[id]; + &old_crtc_state->icl_port_dplls[id];if (!port_dpll->pll)continue ;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/icl: Clear the shared port PLLs from the new crtc state
For consistency clear the icl_port_dplls from the new crtc state, when releasing the DPLLs from the old crtc state. Leaving them set could result in releasing the same PLLs multiple times from the same CRTC state incorrectly (if the same CRTC was first used for a TypeC port then for a combo PHY port).
Leaving the stale pointers behind happens not to cause a problem atm (since the incorrect releasing will be a NOP), but we need to fix that for consistency.
--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +7 -5
@@ -3021,15 +3021,17 @@ static void icl_put_dplls(struct intel_atomic_state *state, new_crtc_state->shared_dpll =NULL ;for (id =ICL_PORT_DPLL_DEFAULT ; id <ICL_PORT_DPLL_COUNT ; id++) { -struct icl_port_dpll *port_dpll = +struct icl_port_dpll *old_port_dpll = &old_crtc_state->icl_port_dplls[id]; +struct icl_port_dpll *new_port_dpll = + &new_crtc_state->icl_port_dplls[id]; -if (!port_dpll->pll) -continue ; + new_port_dpll->pll =NULL ; -intel_unreference_shared_dpll (state, crtc, port_dpll->pll); +if (!old_port_dpll->pll) +continue ; -/* FIXME: Clear the icl_port_dplls from the new crtc state */ +intel_unreference_shared_dpll (state, crtc, old_port_dpll->pll); } }
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/icl: Clear the shared port PLLs from the new crtc state
Quoted 20 lines · Imre Deak
For consistency clear the
icl_port_dpllsfrom the new crtc state, when releasing the DPLLs from the old crtc state. Leaving them set could result in releasing the same PLLs multiple times from the same CRTC state incorrectly (if the same CRTC was first used for a TypeC port then for a combo PHY port).Leaving the stale pointers behind happens not to cause a problem atm (since the incorrect releasing will be a NOP), but we need to fix that for consistency.
Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/display/intel_dpll_mgr.c +0
-0
drivers/gpu/drm/i915/display/intel_dpll_mgr.c static void icl_put_dplls(struct intel_atomic_state *state, · line 3027
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +3
-1@@ -3021,15 +3021,17 @@ static void icl_put_dplls(struct intel_atomic_state *state, new_crtc_state->shared_dpll =NULL ;for (id =ICL_PORT_DPLL_DEFAULT ; id <ICL_PORT_DPLL_COUNT ; id++) { -struct icl_port_dpll *port_dpll = +struct icl_port_dpll *old_port_dpll = &old_crtc_state->icl_port_dplls[id]; +struct icl_port_dpll *new_port_dpll = + &new_crtc_state->icl_port_dplls[id];
I would constify the old states in both patches.
Series is
Quoted 21 lines
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +4
-4-if (!port_dpll->pll) -continue ; + new_port_dpll->pll =NULL ; -intel_unreference_shared_dpll (state, crtc, port_dpll->pll); +if (!old_port_dpll->pll) +continue ; -/* FIXME: Clear the icl_port_dplls from the new crtc state */ +intel_unreference_shared_dpll (state, crtc, old_port_dpll->pll); } }Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Clear the shared PLL from the put_dplls() hook
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Clear the shared PLL from the put_dplls() hook
URL : https://patchwork.freedesktop.org/series/63283/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6425 -> Patchwork_13549
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/
Known issues
------------
Here are the changes found in Patchwork_13549 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* {igt@gem_ctx_switch@legacy-render}:
- fi-icl-u2: [INCOMPLETE][1] ([fdo#107713]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-icl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/fi-icl-u2/igt@[email protected]
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [INCOMPLETE][3] ([fdo#107718]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-blb-e6850/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/fi-blb-e6850/igt@[email protected]
* igt@gem_mmap_gtt@basic-write-read-distinct:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7567u: [FAIL][7] ([fdo#109485]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/fi-kbl-7567u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/fi-kbl-7567u/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#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
Participating hosts (55 -> 46)
------------------------------
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6425 -> Patchwork_13549
CI_DRM_6425: 62149faa04e66d4d16166c89ba441977a0656119 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5087: f0e39642f6f8da5406627bfa79c6600df949e203 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13549: b41cad89bcdf424e332d79366e6d428aa4fd6821 @ git://anongit.freedesktop.org/gfx-ci/linux
== Kernel 32bit build ==
Warning: Kernel 32bit buildtest failed:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/build_32bit.log
CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h
Kernel: arch/x86/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 112 modules
ERROR: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
ERROR: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:91: recipe for target '__modpost' failed make[1]: *** [__modpost] Error 1
Makefile:1287: recipe for target 'modules' failed
make: *** [modules] Error 2
== Linux commits ==
b41cad89bcdf drm/i915/icl: Clear the shared port PLLs from the new crtc state d7ddd9523793 drm/i915: Clear the shared PLL from the put_dplls() hook
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915: Clear the shared PLL from the put_dplls() hook
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Clear the shared PLL from the put_dplls() hook
URL : https://patchwork.freedesktop.org/series/63283/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6425_full -> Patchwork_13549_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13549_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_crc@pipe-c-cursor-128x42-onscreen:
- shard-skl: [PASS][1] -> [FAIL][2] ([fdo#103232])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl9/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-skl9/igt@[email protected]
- shard-apl: [PASS][3] -> [FAIL][4] ([fdo#103232])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-apl1/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [PASS][5] -> [FAIL][6] ([fdo#104873])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-glk3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-glk9/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [PASS][7] -> [FAIL][8] ([fdo#103167]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl5/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-apl5/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103166])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-iclb6/igt@[email protected]
* igt@kms_psr@psr2_dpms:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb2/igt@kms_psr@psr2_dpms.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-iclb7/igt@kms_psr@psr2_dpms.html
#### Possible fixes ####
* igt@gem_ctx_isolation@vcs0-s3:
- shard-kbl: [INCOMPLETE][15] ([fdo#103665]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-kbl6/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-kbl7/igt@[email protected]
* igt@gem_softpin@noreloc-s3:
- shard-skl: [INCOMPLETE][17] ([fdo#104108]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-skl10/igt@[email protected]
* igt@i915_pm_rpm@i2c:
- shard-hsw: [FAIL][19] ([fdo#104097]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-hsw4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-hsw4/igt@[email protected]
* igt@i915_pm_rpm@system-suspend:
- shard-kbl: [INCOMPLETE][21] ([fdo#103665] / [fdo#107807]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-kbl4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-kbl6/igt@[email protected]
* igt@i915_pm_rpm@system-suspend-modeset:
- shard-apl: [INCOMPLETE][23] ([fdo#103927]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-apl4/igt@[email protected]
* igt@kms_flip@modeset-vs-vblank-race:
- shard-glk: [FAIL][25] ([fdo#103060]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-glk6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-glk2/igt@[email protected]
- shard-apl: [FAIL][27] ([fdo#103060]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl6/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-apl8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [FAIL][29] ([fdo#103167]) -> [PASS][30] +7 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-iclb1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][31] ([fdo#108145]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl5/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-skl6/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [FAIL][33] ([fdo#103166]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb4/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-iclb1/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][35] ([fdo#109441]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-iclb1/igt@kms_psr@psr2_sprite_plane_move.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][37] ([fdo#108566]) -> [PASS][38] +4 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-apl3/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-apl6/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [FAIL][39] ([fdo#110728]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6425/shard-skl6/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13549/shard-skl7/igt@[email protected]
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
Participating hosts (9 -> 10)
------------------------------
Additional (1): pig-skl-6260u
Build changes
-------------
* Linux: CI_DRM_6425 -> Patchwork_13549
CI_DRM_6425: 62149faa04e66d4d16166c89ba441977a0656119 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5087: f0e39642f6f8da5406627bfa79c6600df949e203 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13549: b41cad89bcdf424e332d79366e6d428aa4fd6821 @ 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_13549/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx