Commit b719a9c1 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd/display: Fix NULL pointer dereference at hibernate 

During hibernate sequence the source context might not have a clk_mgr.
So don't use it to look for DML2 support.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2980


Fixes: 7966f319 ("drm/amd/display: Introduce DML2")
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 71225e1c

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

+2 −2
Original line number Diff line number Diff line
@@ -4554,7 +4554,7 @@ void dc_resource_state_copy_construct( 
	struct dml2_context *dml2 = NULL;



	// Need to preserve allocated dml2 context

	if (src_ctx->clk_mgr->ctx->dc->debug.using_dml2)

	if (src_ctx->clk_mgr && src_ctx->clk_mgr->ctx->dc->debug.using_dml2)

		dml2 = dst_ctx->bw_ctx.dml2;

#endif
@@ -4562,7 +4562,7 @@ void dc_resource_state_copy_construct( 


#ifdef CONFIG_DRM_AMD_DC_FP

	// Preserve allocated dml2 context

	if (src_ctx->clk_mgr->ctx->dc->debug.using_dml2)

	if (src_ctx->clk_mgr && src_ctx->clk_mgr->ctx->dc->debug.using_dml2)

		dst_ctx->bw_ctx.dml2 = dml2;

#endif