drm/amdgpu: Regression fixes from MST atomic-only conversion
Subsystems (5)
v2 cover drm/amdgpu: Regression fixes from MST atomic-only conversion
There was a bit of unexpected fallout from the atomic-only conversion patches that I had pushed a while ago, which mostly affected amdgpu. This fixes most of the severe issues, although we're still investigating some lingering issues (which I suspect may just fix themselves following this patchset, but we'll see!).
This is -technically- a v2 as it's a continuation on this previous series:
https://patchwork.freedesktop.org/series/110556/
and there were some rather important changes made since then that Wayne pointed out, which may or may not fix the last few issues left on this issue:
https://gitlab.freedesktop.org/drm/amd/-/issues/2171
Note I've omitted one KASAN fix, but that's because it was just getting in the way of turning on KASAN and was definitely unrelated to this bug. Will submit that one on it's own shortly.
Lyude Paul (4):
drm/amdgpu/mst: Stop ignoring error codes and deadlocking drm/display/dp_mst: Fix drm_dp_mst_add_affected_dsc_crtcs() return
code
drm/amdgpu/dm/mst: Use the correct topology mgr pointer in
amdgpu_dm_connector
drm/amdgpu/dm/dp_mst: Don't grab mst_mgr->lock when computing DSC
state
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 254 ++++++++++-------- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- 4 files changed, 155 insertions(+), 131 deletions(-)
Signature · 1 line
2.37.3
PATCH v2 1/4 drm/amdgpu/mst: Stop ignoring error codes and deadlocking
It appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.
V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++-------- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -8
@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state,struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state (state, connector, new_con_state, i) {
@@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num; -drm_dp_mst_atomic_enable_dsc (state, aconnector->port, dm_conn_state->pbn, - false); + ret =drm_dp_mst_atomic_enable_dsc (state, aconnector->port, + dm_conn_state->pbn, false); +if (ret <0 ) +return ret; +continue ; }
@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif
@@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state->context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state->context, vars); +if (ret) {DRM_DEBUG_DRIVER ("compute_mst_dsc_configs_for_state() failed\n" ); - ret = -EINVAL ; goto fail; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +131 -104
423 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +6 -6
@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars); enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector,
Signature · 1 line
2.37.3
RE: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
[Public]
All the patch set looks good to me. Feel free to add:
Again, thank you Lyude for helping on this!!!
Regards,
Wayne
Quoted 672 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, November 15, 2022 6:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; [email protected]; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Zuo, Jerry <[email protected]>; Wu, Hersen <[email protected]>; Lin, Wayne <[email protected]>; Thomas Zimmermann <[email protected]>; Mahfooz, Hamza <[email protected]>; Hung, Alex <[email protected]>; Mikita Lipski <[email protected]>; Liu, Wenjing <[email protected]>; Francis, David <[email protected]>; open list:DRM DRIVERS <dri- [email protected]>; open list <[email protected]>
Subject: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlockingIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++------ -- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state(state, connector,
new_con_state, i) { @@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(structdrm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num; - drm_dp_mst_atomic_enable_dsc(state, aconnector-Quoted 1 line
port,
dm_conn_state->pbn,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1- false); + ret = drm_dp_mst_atomic_enable_dsc(state,
aconnector->port,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ dm_conn_state-Quoted 1 line
pbn, false);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-4+if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state- >context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state- >context, vars); +if (ret) {DRM_DEBUG_DRIVER("compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1- ret = -EINVAL ; goto fail; }diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cindex6ff96b4bdda5c..bba2e8aaa2c20100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-7@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0bool bpp_increased[MAX_PIPES ];@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(structdrm_atomic_state *state, int remaining_to_increase = 0;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24
-19if (vars[i + k].dsc_enabled) {@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state, if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; - if (drm_dp_atomic_find_time_slots(state, -params[next_index].port->mgr,
-
params[next_index].port,
-
vars[next_index].pbn) < 0)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1-return false; + ret = drm_dp_atomic_find_time_slots(state, +params[next_index].port->mgr,
+
params[next_index].port,
+
vars[next_index].pbn);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-7+if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state, int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-18if (vars[i + k].dsc_enabled@@ -840,49 +850,52 @@ static bool try_disable_dsc(structdrm_atomic_state *state, break; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port- >mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port- >mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; - if (!drm_dp_mst_atomic_check(state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0struct dc_stream_state *stream;struct dsc_mst_fairness_params params[MAX_PIPES ];struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_state *mst_state =
drm_atomic_get_mst_topology_state(state, mgr);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-2int count =0 ; -int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); #if
defined(CONFIG_DRM_AMD_DC_DCN)@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(structdrm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2if (count ==0 ) {ASSERT (0 ); -return true; +return 0 ; } /* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct
drm_atomic_state*state,
vars[i + k].pbn =kbps_to_peak_pbn(params[i].bw_range.stream_kbps);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; - if (drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- vars[i + k].pbn) < 0) -return false; + ret = drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-12+ vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; - if (drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; - if (drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } - if (drm_dp_mst_atomic_check(state)) - return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ - if (!increase_dsc_bpp(state, mst_state, dc_link, params, vars, count, k)) - return false; + ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars,count, k);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28
-21+if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(structdrm_atomic_state *state, continue;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, if (stream->timing.flags.DSC == 1) if (dc_stream_add_dsc_to_resource(stream->ctx- >dc, dc_state, stream) != DC_OK) -return false; + return -EINVAL; } -return true; +return ret; } -static bool - pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1mutex_unlock (&aconnector->mst_mgr.lock);@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state*state, @@ -1253,9 +1279,9 @@ static bool
is_dsc_precompute_needed(struct drm_atomic_state *state)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-7return ret; } -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state, if (!is_dsc_precompute_needed(state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0for (i =0 ; i < local_dc_state->stream_count; i++) { struct dc_stream_state *stream = dm_state->context-Quoted 1 line
streams[i]; @@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct
drm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1if (ret !=0 ) goto clean_exit; - if (!pre_compute_mst_dsc_configs_for_state(state, local_dc_state,vars)) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ ret = pre_compute_mst_dsc_configs_for_state(state, local_dc_state,vars);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+if (ret !=0 ) {DRM_INFO_ONCE("pre_compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int
kbps_from_pbn(unsigned int pbn)diff --gita/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hindexb92a7c5671aa2..97fd70df531bf100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-7@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars); enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector, --2.37.3
Re: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
Quoted 6 lines · Wayne
[Public]
All the patch set looks good to me. Feel free to add:
Reviewed-by Wayne Lin <[email protected]>Again, thank you Lyude for helping on this!!!
No problem! I was the one who introduced the bug anyway :P, I'm just glad we were able to fix this on time.
Harry, Alex - feel free to merge this on whatever branch you want (I'm fine with the mst-helper bits going through amd's branch, especially since AMD is the only driver using the dsc stuff right now)
Quoted 676 lines
Regards,
WayneQuoted 672 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, November 15, 2022 6:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; [email protected]; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Zuo, Jerry <[email protected]>; Wu, Hersen <[email protected]>; Lin, Wayne <[email protected]>; Thomas Zimmermann <[email protected]>; Mahfooz, Hamza <[email protected]>; Hung, Alex <[email protected]>; Mikita Lipski <[email protected]>; Liu, Wenjing <[email protected]>; Francis, David <[email protected]>; open list:DRM DRIVERS <dri- [email protected]>; open list <[email protected]>
Subject: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlockingIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++------ -- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state(state, connector,
new_con_state, i) { @@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(structdrm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num; - drm_dp_mst_atomic_enable_dsc(state, aconnector-Quoted 1 line
port,
dm_conn_state->pbn,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1- false); + ret = drm_dp_mst_atomic_enable_dsc(state,
aconnector->port,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ dm_conn_state-Quoted 1 line
pbn, false);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-4+if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state- > context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state- > context, vars); +if (ret) {DRM_DEBUG_DRIVER("compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1- ret = -EINVAL ; goto fail; }diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cindex6ff96b4bdda5c..bba2e8aaa2c20100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-7@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0bool bpp_increased[MAX_PIPES ];@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(structdrm_atomic_state *state, int remaining_to_increase = 0;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24
-19if (vars[i + k].dsc_enabled) {@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state, if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; - if (drm_dp_atomic_find_time_slots(state, -params[next_index].port->mgr,
-
params[next_index].port,
-
vars[next_index].pbn) < 0)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1-return false; + ret = drm_dp_atomic_find_time_slots(state, +params[next_index].port->mgr,
+
params[next_index].port,
+
vars[next_index].pbn);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-7+if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state, int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-18if (vars[i + k].dsc_enabled@@ -840,49 +850,52 @@ static bool try_disable_dsc(structdrm_atomic_state *state, break; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port- > mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port- > mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; - if (!drm_dp_mst_atomic_check(state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0struct dc_stream_state *stream;struct dsc_mst_fairness_params params[MAX_PIPES ];struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_state *mst_state =
drm_atomic_get_mst_topology_state(state, mgr);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-2int count =0 ; -int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); #if
defined(CONFIG_DRM_AMD_DC_DCN)@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(structdrm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2if (count ==0 ) {ASSERT (0 ); -return true; +return 0 ; } /* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct
drm_atomic_state*state,
vars[i + k].pbn =kbps_to_peak_pbn(params[i].bw_range.stream_kbps);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; - if (drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- vars[i + k].pbn) < 0) -return false; + ret = drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-12+ vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; - if (drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; - if (drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } - if (drm_dp_mst_atomic_check(state)) - return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ - if (!increase_dsc_bpp(state, mst_state, dc_link, params, vars, count, k)) - return false; + ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars,count, k);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28
-21+if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(structdrm_atomic_state *state, continue;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, if (stream->timing.flags.DSC == 1) if (dc_stream_add_dsc_to_resource(stream->ctx- > dc, dc_state, stream) != DC_OK) -return false; + return -EINVAL; } -return true; +return ret; } -static bool - pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1mutex_unlock (&aconnector->mst_mgr.lock);@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state*state, @@ -1253,9 +1279,9 @@ static bool
is_dsc_precompute_needed(struct drm_atomic_state *state)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-7return ret; } -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state, if (!is_dsc_precompute_needed(state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0for (i =0 ; i < local_dc_state->stream_count; i++) { struct dc_stream_state *stream = dm_state->context-Quoted 1 line
streams[i]; @@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct
drm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1if (ret !=0 ) goto clean_exit; - if (!pre_compute_mst_dsc_configs_for_state(state, local_dc_state,vars)) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ ret = pre_compute_mst_dsc_configs_for_state(state, local_dc_state,vars);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+if (ret !=0 ) {DRM_INFO_ONCE("pre_compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int
kbps_from_pbn(unsigned int pbn)diff --gita/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hindexb92a7c5671aa2..97fd70df531bf100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-7@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars); enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector, --2.37.3
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Re: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
In reply to Lin, WayneJFYI, Coverity pointed out one more issue with this series so I'm going to send out a respin real quick to fix it. It's just a missing variable assignment (we leave ret unassigned by mistake in pre_compute_mst_dsc_configs()) so I will carry over your r-b on it.
Quoted 682 lines · Wayne
[Public]
All the patch set looks good to me. Feel free to add:
Reviewed-by Wayne Lin <[email protected]>Again, thank you Lyude for helping on this!!!
Regards,
WayneQuoted 672 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, November 15, 2022 6:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; [email protected]; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Zuo, Jerry <[email protected]>; Wu, Hersen <[email protected]>; Lin, Wayne <[email protected]>; Thomas Zimmermann <[email protected]>; Mahfooz, Hamza <[email protected]>; Hung, Alex <[email protected]>; Mikita Lipski <[email protected]>; Liu, Wenjing <[email protected]>; Francis, David <[email protected]>; open list:DRM DRIVERS <dri- [email protected]>; open list <[email protected]>
Subject: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlockingIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++------ -- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state(state, connector,
new_con_state, i) { @@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(structdrm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num; - drm_dp_mst_atomic_enable_dsc(state, aconnector-Quoted 1 line
port,
dm_conn_state->pbn,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1- false); + ret = drm_dp_mst_atomic_enable_dsc(state,
aconnector->port,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ dm_conn_state-Quoted 1 line
pbn, false);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-4+if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state- > context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state- > context, vars); +if (ret) {DRM_DEBUG_DRIVER("compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1- ret = -EINVAL ; goto fail; }diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cindex6ff96b4bdda5c..bba2e8aaa2c20100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-7@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0bool bpp_increased[MAX_PIPES ];@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(structdrm_atomic_state *state, int remaining_to_increase = 0;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24
-19if (vars[i + k].dsc_enabled) {@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state, if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; - if (drm_dp_atomic_find_time_slots(state, -params[next_index].port->mgr,
-
params[next_index].port,
-
vars[next_index].pbn) < 0)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1-return false; + ret = drm_dp_atomic_find_time_slots(state, +params[next_index].port->mgr,
+
params[next_index].port,
+
vars[next_index].pbn);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-7+if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state, int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-18if (vars[i + k].dsc_enabled@@ -840,49 +850,52 @@ static bool try_disable_dsc(structdrm_atomic_state *state, break; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port- > mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port- > mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; - if (!drm_dp_mst_atomic_check(state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0struct dc_stream_state *stream;struct dsc_mst_fairness_params params[MAX_PIPES ];struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_state *mst_state =
drm_atomic_get_mst_topology_state(state, mgr);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-2int count =0 ; -int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); #if
defined(CONFIG_DRM_AMD_DC_DCN)@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(structdrm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2if (count ==0 ) {ASSERT (0 ); -return true; +return 0 ; } /* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct
drm_atomic_state*state,
vars[i + k].pbn =kbps_to_peak_pbn(params[i].bw_range.stream_kbps);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; - if (drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- vars[i + k].pbn) < 0) -return false; + ret = drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-12+ vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; - if (drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; - if (drm_dp_atomic_find_time_slots(state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } - if (drm_dp_mst_atomic_check(state)) - return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ - if (!increase_dsc_bpp(state, mst_state, dc_link, params, vars, count, k)) - return false; + ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars,count, k);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28
-21+if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(structdrm_atomic_state *state, continue;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, if (stream->timing.flags.DSC == 1) if (dc_stream_add_dsc_to_resource(stream->ctx- > dc, dc_state, stream) != DC_OK) -return false; + return -EINVAL; } -return true; +return ret; } -static bool - pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1mutex_unlock (&aconnector->mst_mgr.lock);@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state*state, @@ -1253,9 +1279,9 @@ static bool
is_dsc_precompute_needed(struct drm_atomic_state *state)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-7return ret; } -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state, if (!is_dsc_precompute_needed(state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0for (i =0 ; i < local_dc_state->stream_count; i++) { struct dc_stream_state *stream = dm_state->context-Quoted 1 line
streams[i]; @@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct
drm_atomic_state*state,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1if (ret !=0 ) goto clean_exit; - if (!pre_compute_mst_dsc_configs_for_state(state, local_dc_state,vars)) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ ret = pre_compute_mst_dsc_configs_for_state(state, local_dc_state,vars);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+if (ret !=0 ) {DRM_INFO_ONCE("pre_compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int
kbps_from_pbn(unsigned int pbn)diff --gita/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hindexb92a7c5671aa2..97fd70df531bf100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-7@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars); enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector, --2.37.3
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Re: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
I've already picked this up. Can you send a follow up patch with just the coverity fix?
Alex
Quoted 695 lines · Lyude Paul
JFYI, Coverity pointed out one more issue with this series so I'm going to send out a respin real quick to fix it. It's just a missing variable assignment (we leave ret unassigned by mistake in
pre_compute_mst_dsc_configs()) so I will carry over your r-b on it.Quoted 677 lines · Wayne
[Public]
All the patch set looks good to me. Feel free to add:
Reviewed-by Wayne Lin <[email protected]>Again, thank you Lyude for helping on this!!!
Regards,
WayneQuoted 668 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, November 15, 2022 6:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; [email protected]; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Zuo, Jerry <[email protected]>; Wu, Hersen <[email protected]>; Lin, Wayne <[email protected]>; Thomas Zimmermann <[email protected]>; Mahfooz, Hamza <[email protected]>; Hung, Alex <[email protected]>; Mikita Lipski <[email protected]>; Liu, Wenjing <[email protected]>; Francis, David <[email protected]>; open list:DRM DRIVERS <dri- [email protected]>; open list <[email protected]>
Subject: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlockingIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++------ -- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state(state, connector,
new_con_state, i) { @@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(structdrm_atomic_state*state,dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num;- drm_dp_mst_atomic_enable_dsc(state, aconnector-
Quoted 1 line
port,
dm_conn_state->pbn,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1- false); + ret = drm_dp_mst_atomic_enable_dsc(state,
aconnector->port,
+ dm_conn_state-Quoted 1 line
pbn, false);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-4+if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state- > context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state- > context, vars); +if (ret) { DRM_DEBUG_DRIVER("compute_mst_dsc_configs_for_state()failed\n");
- ret = -EINVAL; goto fail; }diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cindex6ff96b4bdda5c..bba2e8aaa2c20100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-7@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool bpp_increased[MAX_PIPES];drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(structdrm_atomic_state *state, int remaining_to_increase = 0;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24
-19@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state, if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; - if (drm_dp_atomic_find_time_slots(state, -params[next_index].port->mgr,
-
params[next_index].port,
-
vars[next_index].pbn) < 0)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1-return false; + ret = drm_dp_atomic_find_time_slots(state, +params[next_index].port->mgr,
+
params[next_index].port,
+
vars[next_index].pbn);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-7+if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state, int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-18@@ -840,49 +850,52 @@ static bool try_disable_dsc(structdrm_atomic_state *state, break; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port- > mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port- > mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; - if (!drm_dp_mst_atomic_check(state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {struct dc_stream_state *stream; struct dsc_mst_fairness_params params[MAX_PIPES]; struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_state *mst_state = drm_atomic_get_mst_topology_state(state, mgr); int count = 0;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-2-int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); #if
defined(CONFIG_DRM_AMD_DC_DCN)@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(structdrm_atomic_state*state,if (count == 0) { ASSERT(0);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2-return true; +return 0 ; } /* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct
drm_atomic_state*state,vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 = 0;- if (drm_dp_atomic_find_time_slots(state, params[i].port-
Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- vars[i + k].pbn) < 0) -return false; + ret = drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-12+ vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } -if (drm_dp_mst_atomic_check (state)) -return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ -if (!increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k)) -return false; + ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars,count, k);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28
-21+if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(structdrm_atomic_state *state, continue;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, if (stream->timing.flags.DSC == 1) if (dc_stream_add_dsc_to_resource(stream->ctx- > dc, dc_state, stream) != DC_OK) -return false; + return -EINVAL; } -return true; +return ret; } -static bool - pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock(&aconnector->mst_mgr.lock);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state*state, @@ -1253,9 +1279,9 @@ static bool
is_dsc_precompute_needed(struct drm_atomic_state *state)return ret;}
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-7-bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state, if (!is_dsc_precompute_needed(state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;for (i = 0; i < local_dc_state->stream_count; i++) { struct dc_stream_state *stream = dm_state->context-Quoted 1 line
streams[i]; @@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct
drm_atomic_state*state,if (ret != 0) goto clean_exit;- if (!pre_compute_mst_dsc_configs_for_state(state,
local_dc_state,
vars)) {
+ ret = pre_compute_mst_dsc_configs_for_state(state,local_dc_state,
vars);
+ if (ret != 0) {DRM_INFO_ONCE("pre_compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int
kbps_from_pbn(unsigned int pbn)diff --gita/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hindexb92a7c5671aa2..97fd70df531bf100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-6@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars);Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector, --2.37.3
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Re: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
of course, will do in just a moment
Quoted 702 lines · Alex Deucher
I've already picked this up. Can you send a follow up patch with just the coverity fix?
Alex
Quoted 695 lines · Lyude Paul
JFYI, Coverity pointed out one more issue with this series so I'm going to send out a respin real quick to fix it. It's just a missing variable assignment (we leave ret unassigned by mistake in
pre_compute_mst_dsc_configs()) so I will carry over your r-b on it.Quoted 677 lines · Wayne
[Public]
All the patch set looks good to me. Feel free to add:
Reviewed-by Wayne Lin <[email protected]>Again, thank you Lyude for helping on this!!!
Regards,
WayneQuoted 668 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, November 15, 2022 6:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; [email protected]; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Zuo, Jerry <[email protected]>; Wu, Hersen <[email protected]>; Lin, Wayne <[email protected]>; Thomas Zimmermann <[email protected]>; Mahfooz, Hamza <[email protected]>; Hung, Alex <[email protected]>; Mikita Lipski <[email protected]>; Liu, Wenjing <[email protected]>; Francis, David <[email protected]>; open list:DRM DRIVERS <dri- [email protected]>; open list <[email protected]>
Subject: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlockingIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++------ -- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state(state, connector,
new_con_state, i) { @@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(structdrm_atomic_state*state,dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num;- drm_dp_mst_atomic_enable_dsc(state, aconnector-
Quoted 1 line
port,
dm_conn_state->pbn,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1- false); + ret = drm_dp_mst_atomic_enable_dsc(state,
aconnector->port,
+ dm_conn_state-Quoted 1 line
pbn, false);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-4+if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state- > context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state- > context, vars); +if (ret) { DRM_DEBUG_DRIVER("compute_mst_dsc_configs_for_state()failed\n");
- ret = -EINVAL; goto fail; }diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cindex6ff96b4bdda5c..bba2e8aaa2c20100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-7@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool bpp_increased[MAX_PIPES];drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(structdrm_atomic_state *state, int remaining_to_increase = 0;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24
-19@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state, if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; - if (drm_dp_atomic_find_time_slots(state, -params[next_index].port->mgr,
-
params[next_index].port,
-
vars[next_index].pbn) < 0)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1-return false; + ret = drm_dp_atomic_find_time_slots(state, +params[next_index].port->mgr,
+
params[next_index].port,
+
vars[next_index].pbn);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-7+if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state, int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-18@@ -840,49 +850,52 @@ static bool try_disable_dsc(structdrm_atomic_state *state, break; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port- > mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port- > mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; - if (!drm_dp_mst_atomic_check(state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {struct dc_stream_state *stream; struct dsc_mst_fairness_params params[MAX_PIPES]; struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_state *mst_state = drm_atomic_get_mst_topology_state(state, mgr); int count = 0;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-2-int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); #if
defined(CONFIG_DRM_AMD_DC_DCN)@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(structdrm_atomic_state*state,if (count == 0) { ASSERT(0);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2-return true; +return 0 ; } /* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct
drm_atomic_state*state,vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 = 0;- if (drm_dp_atomic_find_time_slots(state, params[i].port-
Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- vars[i + k].pbn) < 0) -return false; + ret = drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-12+ vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } -if (drm_dp_mst_atomic_check (state)) -return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ -if (!increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k)) -return false; + ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars,count, k);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28
-21+if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(structdrm_atomic_state *state, continue;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, if (stream->timing.flags.DSC == 1) if (dc_stream_add_dsc_to_resource(stream->ctx- > dc, dc_state, stream) != DC_OK) -return false; + return -EINVAL; } -return true; +return ret; } -static bool - pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock(&aconnector->mst_mgr.lock);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state*state, @@ -1253,9 +1279,9 @@ static bool
is_dsc_precompute_needed(struct drm_atomic_state *state)return ret;}
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-7-bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state, if (!is_dsc_precompute_needed(state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;for (i = 0; i < local_dc_state->stream_count; i++) { struct dc_stream_state *stream = dm_state->context-Quoted 1 line
streams[i]; @@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct
drm_atomic_state*state,if (ret != 0) goto clean_exit;- if (!pre_compute_mst_dsc_configs_for_state(state,
local_dc_state,
vars)) {
+ ret = pre_compute_mst_dsc_configs_for_state(state,local_dc_state,
vars);
+ if (ret != 0) {DRM_INFO_ONCE("pre_compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int
kbps_from_pbn(unsigned int pbn)diff --gita/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hindexb92a7c5671aa2..97fd70df531bf100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-6@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars);Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector, --2.37.3
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Re: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
JFYI - I'm not sure of the correct commit ID to add for the Fixes: tag since it's in your branch, so I'll omit that and let you add it into the patch
Quoted 706 lines · Lyude Paul
of course, will do in just a moment
Quoted 702 lines · Alex Deucher
I've already picked this up. Can you send a follow up patch with just the coverity fix?
Alex
Quoted 695 lines · Lyude Paul
JFYI, Coverity pointed out one more issue with this series so I'm going to send out a respin real quick to fix it. It's just a missing variable assignment (we leave ret unassigned by mistake in
pre_compute_mst_dsc_configs()) so I will carry over your r-b on it.Quoted 677 lines · Wayne
[Public]
All the patch set looks good to me. Feel free to add:
Reviewed-by Wayne Lin <[email protected]>Again, thank you Lyude for helping on this!!!
Regards,
WayneQuoted 668 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, November 15, 2022 6:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; [email protected]; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Zuo, Jerry <[email protected]>; Wu, Hersen <[email protected]>; Lin, Wayne <[email protected]>; Thomas Zimmermann <[email protected]>; Mahfooz, Hamza <[email protected]>; Hung, Alex <[email protected]>; Mikita Lipski <[email protected]>; Liu, Wenjing <[email protected]>; Francis, David <[email protected]>; open list:DRM DRIVERS <dri- [email protected]>; open list <[email protected]>
Subject: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlockingIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++------ -- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state(state, connector,
new_con_state, i) { @@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(structdrm_atomic_state*state,dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num;- drm_dp_mst_atomic_enable_dsc(state, aconnector-
Quoted 1 line
port,
dm_conn_state->pbn,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1- false); + ret = drm_dp_mst_atomic_enable_dsc(state,
aconnector->port,
+ dm_conn_state-Quoted 1 line
pbn, false);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-4+if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state- > context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state- > context, vars); +if (ret) { DRM_DEBUG_DRIVER("compute_mst_dsc_configs_for_state()failed\n");
- ret = -EINVAL; goto fail; }diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cindex6ff96b4bdda5c..bba2e8aaa2c20100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-7@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool bpp_increased[MAX_PIPES];drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(structdrm_atomic_state *state, int remaining_to_increase = 0;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24
-19@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state, if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; - if (drm_dp_atomic_find_time_slots(state, -params[next_index].port->mgr,
-
params[next_index].port,
-
vars[next_index].pbn) < 0)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1-return false; + ret = drm_dp_atomic_find_time_slots(state, +params[next_index].port->mgr,
+
params[next_index].port,
+
vars[next_index].pbn);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-7+if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state, int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-18@@ -840,49 +850,52 @@ static bool try_disable_dsc(structdrm_atomic_state *state, break; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port- > mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port- > mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; - if (!drm_dp_mst_atomic_check(state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {struct dc_stream_state *stream; struct dsc_mst_fairness_params params[MAX_PIPES]; struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_state *mst_state = drm_atomic_get_mst_topology_state(state, mgr); int count = 0;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-2-int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); #if
defined(CONFIG_DRM_AMD_DC_DCN)@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(structdrm_atomic_state*state,if (count == 0) { ASSERT(0);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2-return true; +return 0 ; } /* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct
drm_atomic_state*state,vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 = 0;- if (drm_dp_atomic_find_time_slots(state, params[i].port-
Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- vars[i + k].pbn) < 0) -return false; + ret = drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-12+ vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } -if (drm_dp_mst_atomic_check (state)) -return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ -if (!increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k)) -return false; + ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars,count, k);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28
-21+if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(structdrm_atomic_state *state, continue;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, if (stream->timing.flags.DSC == 1) if (dc_stream_add_dsc_to_resource(stream->ctx- > dc, dc_state, stream) != DC_OK) -return false; + return -EINVAL; } -return true; +return ret; } -static bool - pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock(&aconnector->mst_mgr.lock);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state*state, @@ -1253,9 +1279,9 @@ static bool
is_dsc_precompute_needed(struct drm_atomic_state *state)return ret;}
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-7-bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state, if (!is_dsc_precompute_needed(state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;for (i = 0; i < local_dc_state->stream_count; i++) { struct dc_stream_state *stream = dm_state->context-Quoted 1 line
streams[i]; @@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct
drm_atomic_state*state,if (ret != 0) goto clean_exit;- if (!pre_compute_mst_dsc_configs_for_state(state,
local_dc_state,
vars)) {
+ ret = pre_compute_mst_dsc_configs_for_state(state,local_dc_state,
vars);
+ if (ret != 0) {DRM_INFO_ONCE("pre_compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int
kbps_from_pbn(unsigned int pbn)diff --gita/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hindexb92a7c5671aa2..97fd70df531bf100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-6@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars);Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector, --2.37.3
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
Re: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
Quoted 3 lines · Lyude Paul
JFYI - I'm not sure of the correct commit ID to add for the Fixes: tag since it's in your branch, so I'll omit that and let you add it into the patch
Yeah, I'll add that. Many thanks!
Alex
Quoted 714 lines · Lyude Paul
Quoted 706 lines
of course, will do in just a moment
Quoted 702 lines · Alex Deucher
I've already picked this up. Can you send a follow up patch with just the coverity fix?
Alex
Quoted 695 lines · Lyude Paul
JFYI, Coverity pointed out one more issue with this series so I'm going to send out a respin real quick to fix it. It's just a missing variable assignment (we leave ret unassigned by mistake in
pre_compute_mst_dsc_configs()) so I will carry over your r-b on it.Quoted 677 lines · Wayne
[Public]
All the patch set looks good to me. Feel free to add:
Reviewed-by Wayne Lin <[email protected]>Again, thank you Lyude for helping on this!!!
Regards,
WayneQuoted 668 lines
-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, November 15, 2022 6:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; [email protected]; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Pan, Xinhui <[email protected]>; David Airlie <[email protected]>; Daniel Vetter <[email protected]>; Kazlauskas, Nicholas <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Zuo, Jerry <[email protected]>; Wu, Hersen <[email protected]>; Lin, Wayne <[email protected]>; Thomas Zimmermann <[email protected]>; Mahfooz, Hamza <[email protected]>; Hung, Alex <[email protected]>; Mikita Lipski <[email protected]>; Liu, Wenjing <[email protected]>; Francis, David <[email protected]>; open list:DRM DRIVERS <dri- [email protected]>; open list <[email protected]>
Subject: [PATCH v2 1/4] drm/amdgpu/mst: Stop ignoring error codes and deadlockingIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++------ -- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state(state, connector,
new_con_state, i) { @@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(structdrm_atomic_state*state,dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num;- drm_dp_mst_atomic_enable_dsc(state, aconnector-
Quoted 1 line
port,
dm_conn_state->pbn,drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1- false); + ret = drm_dp_mst_atomic_enable_dsc(state,
aconnector->port,
+ dm_conn_state-Quoted 1 line
pbn, false);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-4+if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state- > context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state- > context, vars); +if (ret) { DRM_DEBUG_DRIVER("compute_mst_dsc_configs_for_state()failed\n");
- ret = -EINVAL; goto fail; }diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cindex6ff96b4bdda5c..bba2e8aaa2c20100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.cdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-7@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool bpp_increased[MAX_PIPES];drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(structdrm_atomic_state *state, int remaining_to_increase = 0;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +24
-19@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state, if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; - if (drm_dp_atomic_find_time_slots(state, -params[next_index].port->mgr,
-
params[next_index].port,
-
vars[next_index].pbn) < 0)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-1-return false; + ret = drm_dp_atomic_find_time_slots(state, +params[next_index].port->mgr,
+
params[next_index].port,
+
vars[next_index].pbn);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-7+if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state, int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-18@@ -840,49 +850,52 @@ static bool try_disable_dsc(structdrm_atomic_state *state, break; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port- > mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port- > mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; - if (!drm_dp_mst_atomic_check(state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) < 0) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {struct dc_stream_state *stream; struct dsc_mst_fairness_params params[MAX_PIPES]; struct amdgpu_dm_connector *aconnector; struct drm_dp_mst_topology_state *mst_state = drm_atomic_get_mst_topology_state(state, mgr); int count = 0;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-2-int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div = dm_mst_get_pbn_divider(dc_link); #if
defined(CONFIG_DRM_AMD_DC_DCN)@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(structdrm_atomic_state*state,if (count == 0) { ASSERT(0);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2-return true; +return 0 ; } /* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct
drm_atomic_state*state,vars[i + k].pbn = kbps_to_peak_pbn(params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 = 0;- if (drm_dp_atomic_find_time_slots(state, params[i].port-
Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- vars[i + k].pbn) < 0) -return false; + ret = drm_dp_atomic_find_time_slots(state, params[i].port-Quoted 1 line
mgr, params[i].port,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +22
-12+ vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) < 0) - return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } -if (drm_dp_mst_atomic_check (state)) -return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ -if (!increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k)) -return false; + ret = increase_dsc_bpp(state, mst_state, dc_link, params, vars,count, k);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +28
-21+if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(structdrm_atomic_state *state, continue;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, if (stream->timing.flags.DSC == 1) if (dc_stream_add_dsc_to_resource(stream->ctx- > dc, dc_state, stream) != DC_OK) -return false; + return -EINVAL; } -return true; +return ret; } -static bool - pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, - struct dc_state *dc_state, - struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock(&aconnector->mst_mgr.lock);drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state*state, @@ -1253,9 +1279,9 @@ static bool
is_dsc_precompute_needed(struct drm_atomic_state *state)return ret;}
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-7-bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state, if (!is_dsc_precompute_needed(state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;for (i = 0; i < local_dc_state->stream_count; i++) { struct dc_stream_state *stream = dm_state->context-Quoted 1 line
streams[i]; @@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct
drm_atomic_state*state,if (ret != 0) goto clean_exit;- if (!pre_compute_mst_dsc_configs_for_state(state,
local_dc_state,
vars)) {
+ ret = pre_compute_mst_dsc_configs_for_state(state,local_dc_state,
vars);
+ if (ret != 0) {DRM_INFO_ONCE("pre_compute_mst_dsc_configs_for_state()
failed\n");drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-2- ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int
kbps_from_pbn(unsigned int pbn)diff --gita/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hindexb92a7c5671aa2..97fd70df531bf100644
---a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.hdrivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6
-6@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars);Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector, --2.37.3
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
PATCH v3 1/1 drm/amdgpu/mst: Stop ignoring error codes and deadlocking
In reply to Lyude PaulIt appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.
V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)
V3:
* Fix uninitialized var in pre_compute_mst_dsc_configs_for_state()
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++-------- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10 -8
@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state,struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state (state, connector, new_con_state, i) {
@@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num; -drm_dp_mst_atomic_enable_dsc (state, aconnector->port, dm_conn_state->pbn, - false); + ret =drm_dp_mst_atomic_enable_dsc (state, aconnector->port, + dm_conn_state->pbn, false); +if (ret <0 ) +return ret; +continue ; }
@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif
@@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state->context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state->context, vars); +if (ret) {DRM_DEBUG_DRIVER ("compute_mst_dsc_configs_for_state() failed\n" ); - ret = -EINVAL ; goto fail; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +131 -104
423 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +6 -6
@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars); enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector,
Signature · 1 line
2.38.1
Re: [v3] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
Quoted 8 lines · Lyude Paul
It appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.
Quoted 5 lines
V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)
V3:
* Fix uninitialized var inpre_compute_mst_dsc_configs_for_state()
FYI v2 was just merged recently, it's in the 6.2 pull request that was sent out and Alex planned to add it to 6.1-fixes next week too.
Can you send just the delta from v2->v3 as another patch so it can layer in cleanly?
Quoted 535 lines
Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Reviewed-by Wayne Lin <[email protected]>Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++-------- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-8@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state,struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state (state, connector, new_con_state, i) {@@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num; -drm_dp_mst_atomic_enable_dsc (state, aconnector->port, dm_conn_state->pbn, - false); + ret =drm_dp_mst_atomic_enable_dsc (state, aconnector->port, + dm_conn_state->pbn, false); +if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state->context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state->context, vars); +if (ret) {DRM_DEBUG_DRIVER ("compute_mst_dsc_configs_for_state() failed\n" ); - ret = -EINVAL ; goto fail; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +131
-104@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool bpp_increased[MAX_PIPES ];@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state,int remaining_to_increase =0 ;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled) {@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state,if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } }else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state,int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) { if (vars[i + k].dsc_enabled@@ -840,49 +850,52 @@ static bool try_disable_dsc(struct drm_atomic_state *state,break ; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {struct dc_stream_state *stream;struct dsc_mst_fairness_params params[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;struct drm_dp_mst_topology_state *mst_state =drm_atomic_get_mst_topology_state (state, mgr);int count =0 ; -int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div =dm_mst_get_pbn_divider (dc_link);#if defined(CONFIG_DRM_AMD_DC_DCN )@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,if (count ==0 ) {ASSERT (0 ); -return true; +return 0 ; }/* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, params[i].port, - vars[i + k].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, params[i].port, + vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } -if (drm_dp_mst_atomic_check (state)) -return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ -if (!increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k)) -return false; + ret =increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,continue ;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,if (stream->timing.flags.DSC ==1 )if (dc_stream_add_dsc_to_resource (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ; } -return true; +return ret; } -static bool -pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state *state,@@ -1253,9 +1279,9 @@ static bool is_dsc_precompute_needed(struct drm_atomic_state *state)return ret; } -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state,if (!is_dsc_precompute_needed (state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;for (i =0 ; i < local_dc_state->stream_count; i++) {struct dc_stream_state *stream = dm_state->context->streams[i];@@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct drm_atomic_state *state,if (ret !=0 ) goto clean_exit; -if (!pre_compute_mst_dsc_configs_for_state (state, local_dc_state, vars)) { + ret =pre_compute_mst_dsc_configs_for_state (state, local_dc_state, vars); +if (ret !=0 ) {DRM_INFO_ONCE ("pre_compute_mst_dsc_configs_for_state() failed\n" ); - ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int kbps_from_pbn (unsigned int pbn)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +6
-6@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars); enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector,
Re: [v3] drm/amdgpu/mst: Stop ignoring error codes and deadlocking
Quoted 15 lines · Mario
Quoted 8 lines · Lyude Paul
It appears that amdgpu makes the mistake of completely ignoring the return values from the DP MST helpers, and instead just returns a simple true/false. In this case, it seems to have come back to bite us because as a result of simply returning false from
compute_mst_dsc_configs_for_state(), amdgpu had no way of telling when a deadlock happened from these helpers. This could definitely result in some kernel splats.Quoted 5 lines
V2:
* Address Wayne's comments (fix another bunch of spots where we weren't passing down return codes)
V3:
* Fix uninitialized var inpre_compute_mst_dsc_configs_for_state()
Quoted 5 lines
FYI v2 was just merged recently, it's in the 6.2 pull request that was sent out and Alex planned to add it to 6.1-fixes next week too.
Can you send just the delta from
v2->v3as another patch so it can layer in cleanly?
Just did that :), it should be on the list now
Quoted 536 lines
Quoted 535 lines
Signed-off-by Lyude Paul <[email protected]>Fixes 8c20a1ed9b4f ("drm/amd/display: MST DSC compute fair share")Reviewed-by Wayne Lin <[email protected]>Cc Harry Wentland <[email protected]>Cc <[email protected]> # v5.6+--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 235 ++++++++++-------- .../display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 +- 3 files changed, 147 insertions(+), 118 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-8@@ -6462,7 +6462,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state,struct drm_connector_state *new_con_state;struct amdgpu_dm_connector *aconnector;struct dm_connector_state *dm_conn_state; -int i, j; +int i, j, ret;int vcpi, pbn_div, pbn, slot_num =0 ;for_each_new_connector_in_state (state, connector, new_con_state, i) {@@ -6509,8 +6509,11 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, dm_conn_state->pbn = pbn; dm_conn_state->vcpi_slots = slot_num; -drm_dp_mst_atomic_enable_dsc (state, aconnector->port, dm_conn_state->pbn, - false); + ret =drm_dp_mst_atomic_enable_dsc (state, aconnector->port, + dm_conn_state->pbn, false); +if (ret <0 ) +return ret; +continue ; }@@ -9523,10 +9526,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,#if defined(CONFIG_DRM_AMD_DC_DCN )if (dc_resource_is_dsc_encoding_supported (dc)) { -if (!pre_validate_dsc (state, &dm_state, vars)) { - ret = -EINVAL ; + ret =pre_validate_dsc (state, &dm_state, vars); +if (ret !=0 ) goto fail; - } }#endif @@ -9621,9 +9623,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, }#if defined(CONFIG_DRM_AMD_DC_DCN ) -if (!compute_mst_dsc_configs_for_state (state, dm_state->context, vars)) { + ret =compute_mst_dsc_configs_for_state (state, dm_state->context, vars); +if (ret) {DRM_DEBUG_DRIVER ("compute_mst_dsc_configs_for_state() failed\n" ); - ret = -EINVAL ; goto fail; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +131
-104@@ -703,13 +703,13 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn)return dsc_config.bits_per_pixel; } -static bool increase_dsc_bpp (struct drm_atomic_state *state, -struct drm_dp_mst_topology_state *mst_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int increase_dsc_bpp (struct drm_atomic_state *state, +struct drm_dp_mst_topology_state *mst_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool bpp_increased[MAX_PIPES ];@@ -719,6 +719,7 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state,int remaining_to_increase =0 ;int link_timeslots_used;int fair_pbn_alloc; +int ret =0 ;for (i =0 ; i < count; i++) {if (vars[i + k].dsc_enabled) {@@ -757,52 +758,60 @@ static bool increase_dsc_bpp(struct drm_atomic_state *state,if (initial_slack[next_index] > fair_pbn_alloc) { vars[next_index].pbn += fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 =bpp_x16_from_pbn (params[next_index], vars[next_index].pbn); }else { vars[next_index].pbn -= fair_pbn_alloc; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } }else { vars[next_index].pbn += initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; + + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].bpp_x16 = params[next_index].bw_range.max_target_bpp_x16; }else { vars[next_index].pbn -= initial_slack[next_index]; -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } } bpp_increased[next_index] = true; remaining_to_increase--; } -return true; +return 0 ; } -static bool try_disable_dsc (struct drm_atomic_state *state, -struct dc_link *dc_link, -struct dsc_mst_fairness_params *params, -struct dsc_mst_fairness_vars *vars, -int count, -int k) +static int try_disable_dsc (struct drm_atomic_state *state, +struct dc_link *dc_link, +struct dsc_mst_fairness_params *params, +struct dsc_mst_fairness_vars *vars, +int count, +int k) {int i;bool tried[MAX_PIPES ];@@ -810,6 +819,7 @@ static bool try_disable_dsc(struct drm_atomic_state *state,int max_kbps_increase;int next_index;int remaining_to_try =0 ; +int ret;for (i =0 ; i < count; i++) { if (vars[i + k].dsc_enabled@@ -840,49 +850,52 @@ static bool try_disable_dsc(struct drm_atomic_state *state,break ; vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.stream_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; -if (!drm_dp_mst_atomic_check (state)) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 ) { vars[next_index].dsc_enabled = false; vars[next_index].bpp_x16 =0 ; }else { vars[next_index].pbn =kbps_to_peak_pbn (params[next_index].bw_range.max_kbps); -if (drm_dp_atomic_find_time_slots (state, - params[next_index].port->mgr, - params[next_index].port, - vars[next_index].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, + params[next_index].port->mgr, + params[next_index].port, + vars[next_index].pbn); +if (ret <0 ) +return ret; } tried[next_index] = true; remaining_to_try--; } -return true; +return 0 ; } -static bool compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dc_link *dc_link, -struct dsc_mst_fairness_vars *vars, -struct drm_dp_mst_topology_mgr *mgr, -int *link_vars_start_index) +static int compute_mst_dsc_configs_for_link (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dc_link *dc_link, +struct dsc_mst_fairness_vars *vars, +struct drm_dp_mst_topology_mgr *mgr, +int *link_vars_start_index) {struct dc_stream_state *stream;struct dsc_mst_fairness_params params[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;struct drm_dp_mst_topology_state *mst_state =drm_atomic_get_mst_topology_state (state, mgr);int count =0 ; -int i, k; +int i, k, ret;bool debugfs_overwrite = false;memset (params,0 ,sizeof (params));if (IS_ERR (mst_state)) -return false; +return PTR_ERR (mst_state); mst_state->pbn_div =dm_mst_get_pbn_divider (dc_link);#if defined(CONFIG_DRM_AMD_DC_DCN )@@ -933,7 +946,7 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state,if (count ==0 ) {ASSERT (0 ); -return true; +return 0 ; }/* k is start index of vars for current phy link used by mst hub */ @@ -947,13 +960,17 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, params[i].port, - vars[i + k].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, params[i].port, + vars[i + k].pbn); +if (ret <0 ) +return ret; } -if (!drm_dp_mst_atomic_check (state) && !debugfs_overwrite) { + ret =drm_dp_mst_atomic_check (state); +if (ret ==0 && !debugfs_overwrite) {set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; + }else if (ret != -ENOSPC ) { +return ret; }/* Try max compression */ @@ -962,31 +979,36 @@ static bool compute_mst_dsc_configs_for_link(struct drm_atomic_state *state, vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.min_kbps); vars[i + k].dsc_enabled = true; vars[i + k].bpp_x16 = params[i].bw_range.min_target_bpp_x16; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; }else { vars[i + k].pbn =kbps_to_peak_pbn (params[i].bw_range.stream_kbps); vars[i + k].dsc_enabled = false; vars[i + k].bpp_x16 =0 ; -if (drm_dp_atomic_find_time_slots (state, params[i].port->mgr, - params[i].port, vars[i + k].pbn) <0 ) -return false; + ret =drm_dp_atomic_find_time_slots (state, params[i].port->mgr, + params[i].port, vars[i + k].pbn); +if (ret <0 ) +return ret; } } -if (drm_dp_mst_atomic_check (state)) -return false; + ret =drm_dp_mst_atomic_check (state); +if (ret !=0 ) +return ret;/* Optimize degree of compression */ -if (!increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k)) -return false; + ret =increase_dsc_bpp (state, mst_state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret; -if (!try_disable_dsc (state, dc_link, params, vars, count, k)) -return false; + ret =try_disable_dsc (state, dc_link, params, vars, count, k); +if (ret <0 ) +return ret;set_dsc_configs_from_fairness_vars (params, vars, count, k); -return true; +return 0 ; } static bool is_dsc_need_re_compute(@@ -1087,15 +1109,16 @@ static bool is_dsc_need_re_compute(return is_dsc_need_re_compute; } -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1118,17 +1141,19 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,continue ;if (dcn20_remove_stream_from_ctx (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ;if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1143,22 +1168,22 @@ bool compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,if (stream->timing.flags.DSC ==1 )if (dc_stream_add_dsc_to_resource (stream->ctx->dc, dc_state, stream) !=DC_OK ) -return false; +return -EINVAL ; } -return true; +return ret; } -static bool -pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars) +static int pre_compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars) {int i, j;struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector;int link_vars_start_index =0 ; +int ret =0 ;for (i =0 ; i < dc_state->stream_count; i++) computed_streams[i] = false;@@ -1184,11 +1209,12 @@ static boolcontinue ;mutex_lock (&aconnector->mst_mgr.lock); -if (!compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, - &link_vars_start_index)) { + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, + &aconnector->mst_mgr, + &link_vars_start_index); +if (ret !=0 ) {mutex_unlock (&aconnector->mst_mgr.lock); -return false; +return ret; }mutex_unlock (&aconnector->mst_mgr.lock);@@ -1198,7 +1224,7 @@ static bool } } -return true; +return ret; } static int find_crtc_index_in_state_by_stream(struct drm_atomic_state *state,@@ -1253,9 +1279,9 @@ static bool is_dsc_precompute_needed(struct drm_atomic_state *state)return ret; } -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars) +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars) {int i;struct dm_atomic_state *dm_state;@@ -1264,11 +1290,12 @@ bool pre_validate_dsc(struct drm_atomic_state *state,if (!is_dsc_precompute_needed (state)) {DRM_INFO_ONCE ("DSC precompute is not needed.\n" ); -return true; +return 0 ; } -if (dm_atomic_get_state (state, dm_state_ptr)) { + ret =dm_atomic_get_state (state, dm_state_ptr); +if (ret !=0 ) {DRM_INFO_ONCE ("dm_atomic_get_state() failed\n" ); -return false; +return ret; } dm_state = *dm_state_ptr;@@ -1280,7 +1307,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state, local_dc_state =kmemdup (dm_state->context,sizeof (struct dc_state ),GFP_KERNEL );if (!local_dc_state) -return false; +return -ENOMEM ;for (i =0 ; i < local_dc_state->stream_count; i++) {struct dc_stream_state *stream = dm_state->context->streams[i];@@ -1316,9 +1343,9 @@ bool pre_validate_dsc(struct drm_atomic_state *state,if (ret !=0 ) goto clean_exit; -if (!pre_compute_mst_dsc_configs_for_state (state, local_dc_state, vars)) { + ret =pre_compute_mst_dsc_configs_for_state (state, local_dc_state, vars); +if (ret !=0 ) {DRM_INFO_ONCE ("pre_compute_mst_dsc_configs_for_state() failed\n" ); - ret = -EINVAL ; goto clean_exit; }@@ -1349,7 +1376,7 @@ bool pre_validate_dsc(struct drm_atomic_state *state,kfree (local_dc_state); -return (ret ==0 ); +return ret; }static unsigned int kbps_from_pbn (unsigned int pbn)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h +6
-6@@ -53,15 +53,15 @@ struct dsc_mst_fairness_vars {struct amdgpu_dm_connector *aconnector; }; -bool compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, -struct dc_state *dc_state, -struct dsc_mst_fairness_vars *vars); +int compute_mst_dsc_configs_for_state (struct drm_atomic_state *state, +struct dc_state *dc_state, +struct dsc_mst_fairness_vars *vars);bool needs_dsc_aux_workaround (struct dc_link *link); -bool pre_validate_dsc (struct drm_atomic_state *state, -struct dm_atomic_state **dm_state_ptr, -struct dsc_mst_fairness_vars *vars); +int pre_validate_dsc (struct drm_atomic_state *state, +struct dm_atomic_state **dm_state_ptr, +struct dsc_mst_fairness_vars *vars); enum dc_status dm_dp_mst_is_port_support_mode( struct amdgpu_dm_connector *aconnector,
Signature · 3 lines
Cheers, Lyude Paul (she/her) Software Engineer at Red Hat
PATCH v2 2/4 drm/display/dp_mst: Fix drm_dp_mst_add_affected_dsc_crtcs() return code
In reply to Lyude PaulLooks like that we're accidentally dropping a pretty important return code here. For some reason, we just return -EINVAL if we fail to get the MST topology state. This is wrong: error codes are important and should never be squashed without being handled, which here seems to have the potential to cause a deadlock.
--- drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
@@ -5186,7 +5186,7 @@ int drm_dp_mst_add_affected_dsc_crtcs(struct drm_atomic_state *state, struct drm mst_state =drm_atomic_get_mst_topology_state (state, mgr);if (IS_ERR (mst_state)) -return -EINVAL ; +return PTR_ERR (mst_state);list_for_each_entry (pos, &mst_state->payloads, next) {
Signature · 1 line
2.37.3
PATCH v2 3/4 drm/amdgpu/dm/mst: Use the correct topology mgr pointer in amdgpu_dm_connector
In reply to Lyude PaulThis bug hurt me. Basically, it appears that we've been grabbing the entirely wrong mutex in the MST DSC computation code for amdgpu! While we've been grabbing:
amdgpu_dm_connector->mst_mgr
That's zero-initialized memory, because the only connectors we'll ever actually be doing DSC computations for are MST ports. Which have mst_mgr zero-initialized, and instead have the correct topology mgr pointer located at:
amdgpu_dm_connector->mst_port->mgr;
I'm a bit impressed that until now, this code has managed not to crash anyone's systems! It does seem to cause a warning in LOCKDEP though:
[ 66.637670] DEBUG_LOCKS_WARN_ON(lock->magic != lock)
This was causing the problems that appeared to have been introduced by:
commit 4d07b0bc4034 ("drm/display/dp_mst: Move all payload info into the atomic state")
This wasn't actually where they came from though. Presumably, before the only thing we were doing with the topology mgr pointer was attempting to grab mst_mgr->lock. Since the above commit however, we grab much more information from mst_mgr including the atomic MST state and respective modesetting locks.
This patch also implies that up until now, it's quite likely we could be susceptible to race conditions when going through the MST topology state for DSC computations since we technically will not have grabbed any lock when going through it.
So, let's fix this by adjusting all the respective code paths to look at the right pointer and skip things that aren't actual MST connectors from a topology.
Gitlab issue: https://gitlab.freedesktop.org/drm/amd/-/issues/2171
--- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +18 -19
@@ -1117,6 +1117,7 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector; +struct drm_dp_mst_topology_mgr *mst_mgr;int link_vars_start_index =0 ;int ret =0 ;
@@ -1131,7 +1132,7 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; -if (!aconnector || !aconnector->dc_sink) +if (!aconnector || !aconnector->dc_sink || !aconnector->port)continue ;if (!aconnector->dc_sink->dsc_caps.dsc_dec_caps.is_dsc_supported)
@@ -1146,16 +1147,13 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ; -mutex_lock (&aconnector->mst_mgr.lock); - - ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, + mst_mgr = aconnector->port->mgr; +mutex_lock (&mst_mgr->lock); + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, mst_mgr, &link_vars_start_index); -if (ret !=0 ) { -mutex_unlock (&aconnector->mst_mgr.lock); +mutex_unlock (&mst_mgr->lock); +if (ret !=0 )return ret; - } -mutex_unlock (&aconnector->mst_mgr.lock);for (j =0 ; j < dc_state->stream_count; j++) {if (dc_state->streams[j]->link == stream->link)
@@ -1182,6 +1180,7 @@ static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,struct dc_stream_state *stream;bool computed_streams[MAX_PIPES ];struct amdgpu_dm_connector *aconnector; +struct drm_dp_mst_topology_mgr *mst_mgr;int link_vars_start_index =0 ;int ret;
@@ -1196,7 +1195,7 @@ static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state, aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context; -if (!aconnector || !aconnector->dc_sink) +if (!aconnector || !aconnector->dc_sink || !aconnector->port)continue ;if (!aconnector->dc_sink->dsc_caps.dsc_dec_caps.is_dsc_supported)
@@ -1208,15 +1207,13 @@ static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,if (!is_dsc_need_re_compute (state, dc_state, stream->link))continue ; -mutex_lock (&aconnector->mst_mgr.lock); - ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, - &aconnector->mst_mgr, + mst_mgr = aconnector->port->mgr; +mutex_lock (&mst_mgr->lock); + ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, mst_mgr, &link_vars_start_index); -if (ret !=0 ) { -mutex_unlock (&aconnector->mst_mgr.lock); +mutex_unlock (&mst_mgr->lock); +if (ret !=0 )return ret; - } -mutex_unlock (&aconnector->mst_mgr.lock);for (j =0 ; j < dc_state->stream_count; j++) {if (dc_state->streams[j]->link == stream->link)
@@ -1419,6 +1416,7 @@ enum dc_status dm_dp_mst_is_port_support_mode(unsigned int upper_link_bw_in_kbps =0 , down_link_bw_in_kbps =0 ;unsigned int max_compressed_bw_in_kbps =0 ;struct dc_dsc_bw_range bw_range = {0 }; +struct drm_dp_mst_topology_mgr *mst_mgr;/* * check if the mode could be supported if DSC pass-through is supported
@@ -1427,7 +1425,8 @@ enum dc_status dm_dp_mst_is_port_support_mode(*/ if (is_dsc_common_config_possible (stream, &bw_range) && aconnector->port->passthrough_aux) { -mutex_lock (&aconnector->mst_mgr.lock); + mst_mgr = aconnector->port->mgr; +mutex_lock (&mst_mgr->lock); cur_link_settings = stream->link->verified_link_cap;
@@ -1440,7 +1439,7 @@ enum dc_status dm_dp_mst_is_port_support_mode( end_to_end_bw_in_kbps =min (upper_link_bw_in_kbps, down_link_bw_in_kbps); -mutex_unlock (&aconnector->mst_mgr.lock); +mutex_unlock (&mst_mgr->lock);/* * use the maximum dsc compression bandwidth as the required
Signature · 1 line
2.37.3
PATCH v2 4/4 drm/amdgpu/dm/dp_mst: Don't grab mst_mgr->lock when computing DSC state
In reply to Lyude PaulNow that we've fixed the issue with using the incorrect topology manager, we're actually grabbing the topology manager's lock - and consequently deadlocking. Luckily for us though, there's actually nothing in AMD's DSC state computation code that really should need this lock. The one exception is the mutex_lock() in dm_dp_mst_is_port_support_mode(), however we grab no locks beneath &mgr->lock there so that should be fine to leave be.
Gitlab issue: https://gitlab.freedesktop.org/drm/amd/-/issues/2171
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +0 -4
@@ -1148,10 +1148,8 @@ int compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,continue ; mst_mgr = aconnector->port->mgr; -mutex_lock (&mst_mgr->lock); ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, mst_mgr, &link_vars_start_index); -mutex_unlock (&mst_mgr->lock);if (ret !=0 )return ret;
@@ -1208,10 +1206,8 @@ static int pre_compute_mst_dsc_configs_for_state(struct drm_atomic_state *state,continue ; mst_mgr = aconnector->port->mgr; -mutex_lock (&mst_mgr->lock); ret =compute_mst_dsc_configs_for_link (state, dc_state, stream->link, vars, mst_mgr, &link_vars_start_index); -mutex_unlock (&mst_mgr->lock);if (ret !=0 )return ret;
Signature · 1 line
2.37.3