From: Harry Wentland Date: Wed, 21 Jun 2017 20:48:06 +0000 (-0400) Subject: drm/amd/display: Don't program scaler if we have no surface X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=866294f80582e252913c72b5e0f1792f6133424d;p=linux.git drm/amd/display: Don't program scaler if we have no surface If we don't have a surface in dc_commit_streams scl_data won't get populated in resource_build_scaling_params_for_context. In this case we shouldn't attempt to program the scaler. Signed-off-by: Harry Wentland Reviewed-by: Dmytro Laktyushkin Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- 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 a83d260cda459..0bab85b27a85e 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 @@ -1099,10 +1099,12 @@ static enum dc_status apply_single_controller_ctx_to_hw( pipe_ctx->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->scl_data, - &pipe_ctx->scl_data, - sizeof(struct scaler_data)) != 0) + if ((!pipe_ctx_old || + memcmp(&pipe_ctx_old->scl_data, &pipe_ctx->scl_data, + sizeof(struct scaler_data)) != 0) && + pipe_ctx->surface) { program_scaler(dc, pipe_ctx); + } /* mst support - use total stream count */ #if defined(CONFIG_DRM_AMD_DC_DCN1_0)