From 8832fa422e8138ffda3951311ccb0931f6412f33 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 11 Oct 2024 02:11:23 +0000 Subject: [PATCH] drm/amd/display: Handle null 'stream_status' in 'planes_changed_for_existing_stream' From Srinivasan Shanmugam 4778982c73d6c9f3fdbdbc6b6c8aa18df98251af in linux-6.6.y/6.6.55 8141f21b941710ecebe49220b69822cab3abd23d in mainline linux --- sys/dev/pci/drm/amd/display/dc/core/dc_resource.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c index a2f302d043c..32df2279f61 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c @@ -2877,8 +2877,10 @@ static bool planes_changed_for_existing_stream(struct dc_state *context, } } - if (!stream_status) + if (!stream_status) { ASSERT(0); + return false; + } for (i = 0; i < set_count; i++) if (set[i].stream == stream) -- 2.20.1