Skip to content

Commit 01eb50e

Browse files
Alex Hungalexdeucher
authored andcommitted
drm/amd/display: ASSERT when failing to find index by plane/stream id
[WHY] find_disp_cfg_idx_by_plane_id and find_disp_cfg_idx_by_stream_id returns an array index and they return -1 when not found; however, -1 is not a valid index number. [HOW] When this happens, call ASSERT(), and return a positive number (which is fewer than callers' array size) instead. This fixes 4 OVERRUN and 2 NEGATIVE_RETURNS issues reported by Coverity. Reviewed-by: Rodrigo Siqueira <[email protected]> Acked-by: Wayne Lin <[email protected]> Signed-off-by: Alex Hung <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 3ac31c9 commit 01eb50e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ static int find_disp_cfg_idx_by_plane_id(struct dml2_dml_to_dc_pipe_mapping *map
8888
return i;
8989
}
9090

91-
return -1;
91+
ASSERT(false);
92+
return __DML2_WRAPPER_MAX_STREAMS_PLANES__;
9293
}
9394

9495
static int find_disp_cfg_idx_by_stream_id(struct dml2_dml_to_dc_pipe_mapping *mapping, unsigned int stream_id)
@@ -100,7 +101,8 @@ static int find_disp_cfg_idx_by_stream_id(struct dml2_dml_to_dc_pipe_mapping *ma
100101
return i;
101102
}
102103

103-
return -1;
104+
ASSERT(false);
105+
return __DML2_WRAPPER_MAX_STREAMS_PLANES__;
104106
}
105107

106108
// The master pipe of a stream is defined as the top pipe in odm slice 0

0 commit comments

Comments
 (0)