drm/amd/display: Move drm_dp_mst_atomic_check() to the front of dc_validate_global_state()
Subsystems (3)
PATCH 1/1 drm/amd/display: Move drm_dp_mst_atomic_check() to the front of dc_validate_global_state()
[Why]
Need to do atomic check first, then validate global state. If not, when connecting both MST and HDMI displays and set a bad mode via xrandr, system will hang.
[How]
Move drm_dp_mst_atomic_check() to the front ofdc_validate_global_state().
Signed-off-by Zhan Liu <[email protected]>
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -4
@@ -8256,6 +8256,16 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, goto fail;#endif +/* +* Perform validation of MST topology in the state: +* We need to perform MST atomic check before calling +* dc_validate_global_state(), or there is a chance +* to get stuck in an infinite loop and hang eventually. +*/ + ret =drm_dp_mst_atomic_check (state); +if (ret) + goto fail; +if (dc_validate_global_state (dc, dm_state->context, false) !=DC_OK ) { ret = -EINVAL ; goto fail;
@@ -8284,10 +8294,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,dc_retain_state (old_dm_state->context); } } -/* Perform validation of MST topology in the state*/ - ret =drm_dp_mst_atomic_check (state); -if (ret) - goto fail;/* Store the overall update type for use later in atomic check. */ for_each_new_crtc_in_state (state, crtc, new_crtc_state, i) {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by Mikita Lipski <[email protected]>
Thanks!
Mikita
Quoted 47 lines · Zhan Liu
[Why]
Need to do atomic check first, then validate global state. If not, when connecting both MST and HDMI displays and set a bad mode via xrandr, system will hang.[How]
Movedrm_dp_mst_atomic_check()to the front ofdc_validate_global_state().Signed-off-by Zhan Liu <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-4@@ -8256,6 +8256,16 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, goto fail;#endif +/* +* Perform validation of MST topology in the state: +* We need to perform MST atomic check before calling +* dc_validate_global_state(), or there is a chance +* to get stuck in an infinite loop and hang eventually. +*/ + ret =drm_dp_mst_atomic_check (state); +if (ret) + goto fail; +if (dc_validate_global_state (dc, dm_state->context, false) !=DC_OK ) { ret = -EINVAL ; goto fail;@@ -8284,10 +8294,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,dc_retain_state (old_dm_state->context); } } -/* Perform validation of MST topology in the state*/ - ret =drm_dp_mst_atomic_check (state); -if (ret) - goto fail;/* Store the overall update type for use later in atomic check. */ for_each_new_crtc_in_state (state, crtc, new_crtc_state, i) {
Signature · 8 lines
Thanks, Mikita Lipski Software Engineer 2, AMD [email protected] _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx