Skip to content

Commit 9725a4f

Browse files
Muhammad Ahmedalexdeucher
authored andcommitted
drm/amd/display: Add null checks for 8K60 lightup
[WHY & HOW] Add some null checks to fix an issue where 8k60 tiled display fails to light up. Cc: Mario Limonciello <mario.limonciello@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Reviewed-by: Charlene Liu <charlene.liu@amd.com> Acked-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Muhammad Ahmed <ahmed.ahmed@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent e4d0be1 commit 9725a4f

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/gpu/drm/amd/display/dc/core/dc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3178,7 +3178,7 @@ static bool update_planes_and_stream_state(struct dc *dc,
31783178
struct pipe_ctx *otg_master = resource_get_otg_master_for_stream(&context->res_ctx,
31793179
context->streams[i]);
31803180

3181-
if (otg_master->stream->test_pattern.type != DP_TEST_PATTERN_VIDEO_MODE)
3181+
if (otg_master && otg_master->stream->test_pattern.type != DP_TEST_PATTERN_VIDEO_MODE)
31823182
resource_build_test_pattern_params(&context->res_ctx, otg_master);
31833183
}
31843184
}

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5190,6 +5190,9 @@ bool dc_resource_acquire_secondary_pipe_for_mpc_odm_legacy(
51905190
sec_next = sec_pipe->next_odm_pipe;
51915191
sec_prev = sec_pipe->prev_odm_pipe;
51925192

5193+
if (pri_pipe == NULL)
5194+
return false;
5195+
51935196
*sec_pipe = *pri_pipe;
51945197

51955198
sec_pipe->top_pipe = sec_top;

0 commit comments

Comments
 (0)