mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 10:59:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/display: Add NULL-checks in dml2 assigned pipe search

Browse Source 
[Why]
NULL-deref regression after:
"drm/amd/display: Fix dml2 assigned pipe search"

[How]
Add verification for potential NULLs

Fixes: d451b534e0 ("drm/amd/display: Fix dml2 assigned pipe search")
Reviewed-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Roman Li <roman.li@amd.com>
Signed-off-by: Gabe Teeger <gabe.teeger@amd.com>
Signed-off-by: Allen Pan <allen.pan@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Allen Pan
2024-01-09 14:54:02 -05:00
committed by Alex Deucher
parent 855f42ba92
commit b8f2234846
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c
View File

@@ -146,19 +146,24 @@ static unsigned int find_pipes_assigned_to_plane(struct dml2_context *ctx,
for (i = 0; i < ctx->config.dcn_pipe_count; i++) {
struct pipe_ctx *pipe = &state->res_ctx.pipe_ctx[i];
if (!pipe->stream)
if (!pipe->plane_state || !pipe->stream)
continue;
get_plane_id(ctx, state, pipe->plane_state, pipe->stream->stream_id,
ctx->v20.scratch.dml_to_dc_pipe_mapping.dml_pipe_idx_to_plane_index[pipe->pipe_idx],
&plane_id_assigned_to_pipe);
if (pipe->plane_state && plane_id_assigned_to_pipe == plane_id && !pipe->top_pipe && !pipe->prev_odm_pipe) {
if (plane_id_assigned_to_pipe == plane_id && !pipe->prev_odm_pipe
&& (!pipe->top_pipe || pipe->top_pipe->plane_state != pipe->plane_state)) {
while (pipe) {
struct pipe_ctx *mpo_pipe = pipe;
struct pipe_ctx *mpc_pipe = pipe;
while (mpo_pipe) {
pipes[num_found++] = mpo_pipe->pipe_idx;
mpo_pipe = mpo_pipe->bottom_pipe;
while (mpc_pipe) {
pipes[num_found++] = mpc_pipe->pipe_idx;
mpc_pipe = mpc_pipe->bottom_pipe;
if (!mpc_pipe)
break;
if (mpc_pipe->plane_state != pipe->plane_state)
mpc_pipe = NULL;
}
pipe = pipe->next_odm_pipe;
}