aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry (Fangzhi) Zuo <Jerry.Zuo@amd.com>2017-10-20 16:45:53 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-10-21 16:53:56 -0400
commit9b38bd1b8f5c874c3d1f330e0dcf4e7d84137477 (patch)
tree1e60c1bd032ba2bcb2e1b1d0b611195e66314bd8
parentaf09e48aa52377eb807709e2a1cdc33e9fd1ac94 (diff)
drm/amd/display:: Fix NULL pointer in Raven hotplug
Programming sequence to frontend and backend has been switched. In such case, program_scaler() is gettingĀ called when programming frontend, and should be removed from backend programming routine. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index e8b8daeeed97..2a6d3ca12954 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1369,13 +1369,6 @@ static enum dc_status apply_single_controller_ctx_to_hw(
1369 } 1369 }
1370 1370
1371 pipe_ctx->plane_res.scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0; 1371 pipe_ctx->plane_res.scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0;
1372 /* program_scaler and allocate_mem_input are not new asic */
1373 if ((!pipe_ctx_old ||
1374 memcmp(&pipe_ctx_old->plane_res.scl_data, &pipe_ctx->plane_res.scl_data,
1375 sizeof(struct scaler_data)) != 0) &&
1376 pipe_ctx->plane_state) {
1377 program_scaler(dc, pipe_ctx);
1378 }
1379 1372
1380 /* mst support - use total stream count */ 1373 /* mst support - use total stream count */
1381 if (pipe_ctx->plane_res.mi != NULL) { 1374 if (pipe_ctx->plane_res.mi != NULL) {