[PATCH] drm/amd/display: Clear phantom stream count and plane count
When dc_state_destruct() was refactored the new phantom_stream_count and phantom_plane_count members weren't cleared. Fixes: 012a04b1d6af ("drm/amd/display: Refactor phantom resource allocation") Signed-off-by: Mario Limonciello --- drivers/gpu/drm/amd/display/dc/core/dc_state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_state.c b/drivers/gpu/drm/amd/display/dc/core/dc_state.c index 88c6436b28b6..180ac47868c2 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c @@ -291,11 +291,14 @@ void dc_state_destruct(struct dc_state *state) dc_stream_release(state->phantom_streams[i]); state->phantom_streams[i] = NULL; } + state->phantom_stream_count = 0; for (i = 0; i < state->phantom_plane_count; i++) { dc_plane_state_release(state->phantom_planes[i]); state->phantom_planes[i] = NULL; } + state->phantom_plane_count = 0; + state->stream_mask = 0; memset(&state->res_ctx, 0, sizeof(state->res_ctx)); memset(&state->pp_display_cfg, 0, sizeof(state->pp_display_cfg)); -- 2.34.1
Re: [PATCH] drm/amd/display: Clear phantom stream count and plane count
[Public] Acked-by: Alex Deucher From: amd-gfx on behalf of Mario Limonciello Sent: Friday, February 2, 2024 7:30 PM To: amd-gfx@lists.freedesktop.org Cc: Limonciello, Mario Subject: [PATCH] drm/amd/display: Clear phantom stream count and plane count When dc_state_destruct() was refactored the new phantom_stream_count and phantom_plane_count members weren't cleared. Fixes: 012a04b1d6af ("drm/amd/display: Refactor phantom resource allocation") Signed-off-by: Mario Limonciello --- drivers/gpu/drm/amd/display/dc/core/dc_state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_state.c b/drivers/gpu/drm/amd/display/dc/core/dc_state.c index 88c6436b28b6..180ac47868c2 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c @@ -291,11 +291,14 @@ void dc_state_destruct(struct dc_state *state) dc_stream_release(state->phantom_streams[i]); state->phantom_streams[i] = NULL; } + state->phantom_stream_count = 0; for (i = 0; i < state->phantom_plane_count; i++) { dc_plane_state_release(state->phantom_planes[i]); state->phantom_planes[i] = NULL; } + state->phantom_plane_count = 0; + state->stream_mask = 0; memset(&state->res_ctx, 0, sizeof(state->res_ctx)); memset(&state->pp_display_cfg, 0, sizeof(state->pp_display_cfg)); -- 2.34.1
Re: [PATCH] drm/amd/display: Clear phantom stream count and plane count
On 2024-02-05 08:54, Deucher, Alexander wrote: > [Public] > > > [Public] > > > Acked-by: Alex Deucher > Reviewed-by: Harry Wentland Harry -- > *From:* amd-gfx on behalf of Mario > Limonciello > *Sent:* Friday, February 2, 2024 7:30 PM > *To:* amd-gfx@lists.freedesktop.org > *Cc:* Limonciello, Mario > *Subject:* [PATCH] drm/amd/display: Clear phantom stream count and plane count > > When dc_state_destruct() was refactored the new phantom_stream_count > and phantom_plane_count members weren't cleared. > > Fixes: 012a04b1d6af ("drm/amd/display: Refactor phantom resource allocation") > Signed-off-by: Mario Limonciello > --- > drivers/gpu/drm/amd/display/dc/core/dc_state.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_state.c > b/drivers/gpu/drm/amd/display/dc/core/dc_state.c > index 88c6436b28b6..180ac47868c2 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc_state.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_state.c > @@ -291,11 +291,14 @@ void dc_state_destruct(struct dc_state *state) > dc_stream_release(state->phantom_streams[i]); > state->phantom_streams[i] = NULL; > } > + state->phantom_stream_count = 0; > > for (i = 0; i < state->phantom_plane_count; i++) { > dc_plane_state_release(state->phantom_planes[i]); > state->phantom_planes[i] = NULL; > } > + state->phantom_plane_count = 0; > + > state->stream_mask = 0; > memset(&state->res_ctx, 0, sizeof(state->res_ctx)); > memset(&state->pp_display_cfg, 0, sizeof(state->pp_display_cfg)); > -- > 2.34.1 >