mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/amd/display: Fix couple more inconsistent NULL checks in dc_resource
Found by smatch: drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:1001 acquire_free_pipe_for_stream() error: we previously assumed 'head_pipe' could be null (see line 998) drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_resource.c:1808 dc_validate_global_state() error: we previously assumed 'new_ctx' could be null (see line 1778) Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
edf38b58ec
commit
e41ab0309a
1 changed files with 7 additions and 2 deletions
|
@ -993,8 +993,10 @@ static struct pipe_ctx *acquire_free_pipe_for_stream(
|
|||
|
||||
head_pipe = resource_get_head_pipe_for_stream(res_ctx, stream);
|
||||
|
||||
if (!head_pipe)
|
||||
if (!head_pipe) {
|
||||
ASSERT(0);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!head_pipe->plane_state)
|
||||
return head_pipe;
|
||||
|
@ -1772,13 +1774,16 @@ enum dc_status dc_validate_global_state(
|
|||
enum dc_status result = DC_ERROR_UNEXPECTED;
|
||||
int i, j;
|
||||
|
||||
if (!new_ctx)
|
||||
return DC_ERROR_UNEXPECTED;
|
||||
|
||||
if (dc->res_pool->funcs->validate_global) {
|
||||
result = dc->res_pool->funcs->validate_global(dc, new_ctx);
|
||||
if (result != DC_OK)
|
||||
return result;
|
||||
}
|
||||
|
||||
for (i = 0; new_ctx && i < new_ctx->stream_count; i++) {
|
||||
for (i = 0; i < new_ctx->stream_count; i++) {
|
||||
struct dc_stream_state *stream = new_ctx->streams[i];
|
||||
|
||||
for (j = 0; j < dc->res_pool->pipe_count; j++) {
|
||||
|
|
Loading…
Reference in a new issue