[AMD Official Use Only - General]
Might want to avoid bringup in the commit description
--
Regards,
Jay
________________________________
From: Wayne Lin <wayne....@amd.com>
Sent: Tuesday, March 12, 2024 5:20 AM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Wentland, Harry <harry.wentl...@amd.com>; Li, Sun peng (Leo)
<sunpeng...@amd.com>; Siqueira, Rodrigo <rodrigo.sique...@amd.com>; Pillai,
Aurabindo <aurabindo.pil...@amd.com>; Li, Roman <roman...@amd.com>; Lin, Wayne
<wayne....@amd.com>; Gutierrez, Agustin <agustin.gutier...@amd.com>; Chung,
ChiaHsuan (Tom) <chiahsuan.ch...@amd.com>; Wu, Hersen <hersenxs...@amd.com>;
Zuo, Jerry <jerry....@amd.com>; Park, Chris <chris.p...@amd.com>; Limonciello,
Mario <mario.limoncie...@amd.com>; Deucher, Alexander
<alexander.deuc...@amd.com>; sta...@vger.kernel.org <sta...@vger.kernel.org>;
Liu, Charlene <charlene....@amd.com>
Subject: [PATCH 33/43] drm/amd/display: Prevent crash on bring-up
From: Chris Park <chris.p...@amd.com>
[Why]
Disabling stream encoder invokes a function that no longer exists
in bring-up.
[How]
Check if the function declaration is NULL in disable stream encoder.
Cc: Mario Limonciello <mario.limoncie...@amd.com>
Cc: Alex Deucher <alexander.deuc...@amd.com>
Cc: sta...@vger.kernel.org
Reviewed-by: Charlene Liu <charlene....@amd.com>
Acked-by: Wayne Lin <wayne....@amd.com>
Signed-off-by: Chris Park <chris.p...@amd.com>
---
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
index 9d5df4c0da59..0ba1feaf96c0 100644
--- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
@@ -1185,7 +1185,8 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx)
if (dccg) {
dccg->funcs->disable_symclk32_se(dccg, dp_hpo_inst);
dccg->funcs->set_dpstreamclk(dccg, REFCLK, tg->inst,
dp_hpo_inst);
- dccg->funcs->set_dtbclk_dto(dccg, &dto_params);
+ if (dccg && dccg->funcs->set_dtbclk_dto)
+ dccg->funcs->set_dtbclk_dto(dccg, &dto_params);
}
} else if (dccg && dccg->funcs->disable_symclk_se) {
dccg->funcs->disable_symclk_se(dccg,
stream_enc->stream_enc_inst,
--
2.37.3
