This is a note to let you know that I've just added the patch titled
drm/amd/display: Add Null check for DPP resource
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-display-add-null-check-for-dpp-resource.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e186400685d8a9287388a8535e2399bc673bfe95 Mon Sep 17 00:00:00 2001
From: Gabe Teeger <gabe.teeger@xxxxxxx>
Date: Fri, 15 Sep 2023 18:18:48 -0400
Subject: drm/amd/display: Add Null check for DPP resource
From: Gabe Teeger <gabe.teeger@xxxxxxx>
commit e186400685d8a9287388a8535e2399bc673bfe95 upstream.
[what and why]
Check whether dpp resource pointer is null in advance and return early
if so.
Reviewed-by: Charlene Liu <charlene.liu@xxxxxxx>
Reviewed-by: Martin Leung <martin.leung@xxxxxxx>
Signed-off-by: Gabe Teeger <gabe.teeger@xxxxxxx>
Cc: Mario Limonciello <mario.limonciello@xxxxxxx>
Cc: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Acked-by: Aurabindo Pillai <aurabindo.pillai@xxxxxxx>
Tested-by: Daniel Wheeler <daniel.wheeler@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -996,7 +996,7 @@ static void adjust_recout_for_visual_con
struct dc *dc = pipe_ctx->stream->ctx->dc;
int dpp_offset, base_offset;
- if (dc->debug.visual_confirm == VISUAL_CONFIRM_DISABLE)
+ if (dc->debug.visual_confirm == VISUAL_CONFIRM_DISABLE || !pipe_ctx->plane_res.dpp)
return;
dpp_offset = pipe_ctx->stream->timing.v_addressable / VISUAL_CONFIRM_DPP_OFFSET_DENO;
Patches currently in stable-queue which might be from gabe.teeger@xxxxxxx are
queue-6.6/drm-amd-display-add-null-check-for-dpp-resource.patch
