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>

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 e8b8daeeed979bd00b7136346ed355a9e068405b..2a6d3ca1295439e171048bdfd36d89ef31986886 100644 (file)
--- 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(
        }
 
        pipe_ctx->plane_res.scl_data.lb_params.alpha_en = pipe_ctx->bottom_pipe != 0;
-       /* program_scaler and allocate_mem_input are not new asic */
-       if ((!pipe_ctx_old ||
-            memcmp(&pipe_ctx_old->plane_res.scl_data, &pipe_ctx->plane_res.scl_data,
-                   sizeof(struct scaler_data)) != 0) &&
-            pipe_ctx->plane_state) {
-               program_scaler(dc, pipe_ctx);
-       }
 
        /* mst support - use total stream count */
        if (pipe_ctx->plane_res.mi != NULL) {