drm/amd/display: add NULL checks for clock manager pointer
Subsystems (3)
PATCH 1/1 drm/amd/display: add NULL checks for clock manager pointer
From: Ahzo <[email protected]>
This fixes kernel NULL pointer dereferences on shutdown:
RIP: 0010:build_audio_output.isra.0+0x97/0x110 [amdgpu] RIP: 0010:enable_link_dp+0x186/0x300 [amdgpu]
Signed-off-by Ahzo <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -1510,7 +1510,7 @@ static enum dc_status enable_link_dp( pipe_ctx->stream_res.pix_clk_params.requested_sym_clk = link_settings.link_rate *LINK_RATE_REF_FREQ_IN_KHZ ; -if (!apply_seamless_boot_optimization) +if (state->clk_mgr && !apply_seamless_boot_optimization) state->clk_mgr->funcs->update_clocks (state->clk_mgr, state, false); dp_enable_link_phy(
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +3 -2
@@ -1161,8 +1161,9 @@ static void build_audio_output( } } -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT || - pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) { +if (state->clk_mgr && + (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT || + pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST )) { audio_output->pll_info.dp_dto_source_clock_in_khz = state->clk_mgr->funcs->get_dp_ref_clk_frequency ( state->clk_mgr);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20191011205154.21075-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Harry Wentland
Reviewed-byQuoted 8 lines · Alex Deucher
From: Ahzo <[email protected]>
This fixes kernel NULL pointer dereferences on shutdown:
RIP: 0010:build_audio_output.isra.0+0x97/0x110 [amdgpu] RIP: 0010:enable_link_dp+0x186/0x300 [amdgpu]Signed-off-by Ahzo <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Reviewed-by Harry Wentland <[email protected]>
Harry
Quoted 25 lines
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/display/dc/core/dc_link.c +1
-1@@ -1510,7 +1510,7 @@ static enum dc_status enable_link_dp( pipe_ctx->stream_res.pix_clk_params.requested_sym_clk = link_settings.link_rate *LINK_RATE_REF_FREQ_IN_KHZ ; -if (!apply_seamless_boot_optimization) +if (state->clk_mgr && !apply_seamless_boot_optimization) state->clk_mgr->funcs->update_clocks (state->clk_mgr, state, false); dp_enable_link_phy(drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +0
-0@@ -1161,8 +1161,9 @@ static void build_audio_output( }
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c static void build_audio_output( · line 1169
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +3
-2} -if (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT || - pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST ) { +if (state->clk_mgr && + (pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT || + pipe_ctx->stream->signal ==SIGNAL_TYPE_DISPLAY_PORT_MST )) { audio_output->pll_info.dp_dto_source_clock_in_khz = state->clk_mgr->funcs->get_dp_ref_clk_frequency ( state->clk_mgr);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx